fix stPreCompiledContracts empty expect

517 files changed, 98178 insertions, 1566 deletions

diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0.json
index 189f4272c..c6f0ed998 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_0_0_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0Filler.json",
             "sourceHash" : "addbfdabb97590154045f98151c8d343472931358ceac67f8fe2fdf8baf28dd7"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xab8e",
-                    "hash" : "0x909207b24bba8dfa9bce1ee71bd356155687a284a71a3f8eccce2e1a15d3f999",
-                    "mixHash" : "0x477dbdcde801750366cb1725081e18df857d35523c3e90a42a6ee00829cb0536",
-                    "nonce" : "0x37442aabbfe3a31a",
+                    "hash" : "0xc197d5b62fb70116bb5b71c03714874621952b612c55c82bd34aab720077b1ce",
+                    "mixHash" : "0x0334b6317c20b1b34ca0c3404f2928e5771a3bc8591f70d92efb23b75a705f09",
+                    "nonce" : "0xdde69b1b8d86fbb5",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x53c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2a053c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92ba0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0477dbdcde801750366cb1725081e18df857d35523c3e90a42a6ee00829cb05368837442aabbfe3a31af90108f901050101830f985894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6a07780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387c0",
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2a053c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92ba0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a00334b6317c20b1b34ca0c3404f2928e5771a3bc8591f70d92efb23b75a705f0988dde69b1b8d86fbb5f90108f901050101830f985894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6a07780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x909207b24bba8dfa9bce1ee71bd356155687a284a71a3f8eccce2e1a15d3f999",
+        "lastblockhash" : "0xc197d5b62fb70116bb5b71c03714874621952b612c55c82bd34aab720077b1ce",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g1v0.json
index 7a73a41bf..5b4176a49 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_0_0_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g1v0Filler.json",
+            "sourceHash" : "90e201df8700d9e440ad3bcbebbb7e93ae49eb694ba3db571f64de506dc5b6df"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0x0278fb5256d89fbe88166141979cf0bd4a700f4c4000cfc98a70bb16cedf8562",
+                    "mixHash" : "0x2981b1a7433b738e2242c609ce605f5faba38c86b4d80fa49b01d0dd962082a7",
+                    "nonce" : "0x908a1f41b61d1cc3",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x3b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x66bfdefbb4e983fccd782f9e7c0491c4000014bfd806f0b036c97e7a0f702fd1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2a066bfdefbb4e983fccd782f9e7c0491c4000014bfd806f0b036c97e7a0f702fd1a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a02981b1a7433b738e2242c609ce605f5faba38c86b4d80fa49b01d0dd962082a788908a1f41b61d1cc3f90108f90105010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03e486c74d59441e65c5625c34b813e411f24a125d9af21da9eb0b794802e4f5da06e47ccacb07f4ae525aa5420fe7436fd8d13c928118bda4e3799e29fd6ecf12cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3e486c74d59441e65c5625c34b813e411f24a125d9af21da9eb0b794802e4f5d",
+                        "s" : "0x6e47ccacb07f4ae525aa5420fe7436fd8d13c928118bda4e3799e29fd6ecf12c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0278fb5256d89fbe88166141979cf0bd4a700f4c4000cfc98a70bb16cedf8562",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g2v0.json
index 7a73a41bf..8cdcedac4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_0_0_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g2v0Filler.json",
+            "sourceHash" : "338f2eef11a8802fec63ece2747480b2a8786c8e82d83c7218e229d25bfaa69b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0xbe925a7718c63e6743ace78c3d1aba81567cd64a270bd6890172954448cf50af",
+                    "mixHash" : "0x36572a065b731d42f556aec97a6e21360e0756d22e057c82c24b7dd778b46d70",
+                    "nonce" : "0x7723a658f76dbc9d",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x3b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d2c2bf061dbd301faa28094c4366ba47b2bee1222be092dafcecd11af12ea75",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2a06d2c2bf061dbd301faa28094c4366ba47b2bee1222be092dafcecd11af12ea75a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a036572a065b731d42f556aec97a6e21360e0756d22e057c82c24b7dd778b46d70887723a658f76dbc9df90108f9010501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba017a21af2e6a03b73a57fe233e3f7bffcb4c6e1471ba03c7bee01b802ba4353b4a0423125dcac7f6dd824484da2287620f136c3cfaa8a4d7574be21388bd0b72d30c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x17a21af2e6a03b73a57fe233e3f7bffcb4c6e1471ba03c7bee01b802ba4353b4",
+                        "s" : "0x423125dcac7f6dd824484da2287620f136c3cfaa8a4d7574be21388bd0b72d30",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbe925a7718c63e6743ace78c3d1aba81567cd64a270bd6890172954448cf50af",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g3v0.json
index 7a73a41bf..c3142d9db 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_0_0_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g3v0Filler.json",
+            "sourceHash" : "ad9feb155bcd52c055e57e1d678ee2c9fcc3a1261c478dd2d73d0021459e32d0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0x2976357765310915ffd77abd9e3f9905a78c048a1677f10a34ae8a66b2ba26a8",
+                    "mixHash" : "0x3884b0821381f34c07eb930d4b9c6f06bafac9e10f0c8feb850643799576f5e9",
+                    "nonce" : "0x5b606494b9043be4",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x3b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe66cee6f20dcacc71403229c40247be1b2210a6b506ffa5205979ce401327aaf",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2a0e66cee6f20dcacc71403229c40247be1b2210a6b506ffa5205979ce401327aafa0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a03884b0821381f34c07eb930d4b9c6f06bafac9e10f0c8feb850643799576f5e9885b606494b9043be4f90108f90105010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0de0e589be9b99e79cbb7ce255194a1bca6f1a5030e308aeb89d99d5a26215326a0405f4eab564021adcb65367f740307fa9f9a229b93bb0f1ca53edbe4af34a939c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xde0e589be9b99e79cbb7ce255194a1bca6f1a5030e308aeb89d99d5a26215326",
+                        "s" : "0x405f4eab564021adcb65367f740307fa9f9a229b93bb0f1ca53edbe4af34a939",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2976357765310915ffd77abd9e3f9905a78c048a1677f10a34ae8a66b2ba26a8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0.json
index 40cb76605..431aef614 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_0_0_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0Filler.json",
             "sourceHash" : "7e10a57c27900e9accb8e6c6ca4dc8f67376ab68d5242e267090487c40d700a5"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xab8e",
-                    "hash" : "0x61a574f36e0740af5e37aeb3bdf372c48574929447088d76484afa52dfd44084",
-                    "mixHash" : "0x5ef063692036a9092a238b09d21707213f431201085f06ea5cc05d0465d6fb8e",
-                    "nonce" : "0xc511039eb78c73c9",
+                    "hash" : "0xde80123c313a2dbc2fab0b94c5eb2dd18b5b5dc1fc78a95f01677dc9cd17e41b",
+                    "mixHash" : "0x57b0e0dedbd1568744bfeca85e87655bd31eaaeaa8728503d36b34114683dc97",
+                    "nonce" : "0x98c77a0c8731d33f",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x4bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2a04bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a05ef063692036a9092a238b09d21707213f431201085f06ea5cc05d0465d6fb8e88c511039eb78c73c9f90108f9010501018302b39094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0fcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231a0578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3c0",
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2a04bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a057b0e0dedbd1568744bfeca85e87655bd31eaaeaa8728503d36b34114683dc978898c77a0c8731d33ff90108f9010501018302b39094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0fcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231a0578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x61a574f36e0740af5e37aeb3bdf372c48574929447088d76484afa52dfd44084",
+        "lastblockhash" : "0xde80123c313a2dbc2fab0b94c5eb2dd18b5b5dc1fc78a95f01677dc9cd17e41b",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g1v0.json
index 7a73a41bf..86308011f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_0_0_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g1v0Filler.json",
+            "sourceHash" : "b43c96185545611b262a1747c252bb0b00aa109fc8cbb49da9c3dc115e3d2538"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0x18a78dd6960f705f0fb0acba30da912be97226951080ed8621f317f63275579d",
+                    "mixHash" : "0x0bee694d45874a387ef672442390d35aff53a00717412268e18a911bdfc95256",
+                    "nonce" : "0xf41427245fb1f1db",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x3b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x66bfdefbb4e983fccd782f9e7c0491c4000014bfd806f0b036c97e7a0f702fd1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2a066bfdefbb4e983fccd782f9e7c0491c4000014bfd806f0b036c97e7a0f702fd1a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a00bee694d45874a387ef672442390d35aff53a00717412268e18a911bdfc9525688f41427245fb1f1dbf90108f90105010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03e486c74d59441e65c5625c34b813e411f24a125d9af21da9eb0b794802e4f5da06e47ccacb07f4ae525aa5420fe7436fd8d13c928118bda4e3799e29fd6ecf12cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3e486c74d59441e65c5625c34b813e411f24a125d9af21da9eb0b794802e4f5d",
+                        "s" : "0x6e47ccacb07f4ae525aa5420fe7436fd8d13c928118bda4e3799e29fd6ecf12c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x18a78dd6960f705f0fb0acba30da912be97226951080ed8621f317f63275579d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g2v0.json
index 7a73a41bf..1dea4db24 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_0_0_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g2v0Filler.json",
+            "sourceHash" : "6c978bed6573a0790937cc10cdc8e4f90cc35c64ff0e4d366f806898104d7aec"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0xe0eaba3872f95f58281ad216a2e8c64c4a8f11d0f72c32b51fffcc2149edfb74",
+                    "mixHash" : "0xe9ff0e05e99a685abb96213ae2b47090099799e2b6435554af9d541fe51ca5f5",
+                    "nonce" : "0x25960e74eaa6b60d",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x3b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d2c2bf061dbd301faa28094c4366ba47b2bee1222be092dafcecd11af12ea75",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2a06d2c2bf061dbd301faa28094c4366ba47b2bee1222be092dafcecd11af12ea75a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0e9ff0e05e99a685abb96213ae2b47090099799e2b6435554af9d541fe51ca5f58825960e74eaa6b60df90108f9010501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba017a21af2e6a03b73a57fe233e3f7bffcb4c6e1471ba03c7bee01b802ba4353b4a0423125dcac7f6dd824484da2287620f136c3cfaa8a4d7574be21388bd0b72d30c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x17a21af2e6a03b73a57fe233e3f7bffcb4c6e1471ba03c7bee01b802ba4353b4",
+                        "s" : "0x423125dcac7f6dd824484da2287620f136c3cfaa8a4d7574be21388bd0b72d30",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe0eaba3872f95f58281ad216a2e8c64c4a8f11d0f72c32b51fffcc2149edfb74",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g3v0.json
index 7a73a41bf..cb05c2e16 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_0_0_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g3v0Filler.json",
+            "sourceHash" : "b38ab70d59b9d033b1568e4e76db6421aba632798ed73a04f12d4cc4724162fc"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0x8201261628cf245c1cf3cf67ef3f07ca61769adf099aed2fe4d61a0574827269",
+                    "mixHash" : "0x0fa89f560f212f258826f90507392b85184eb368c6029b0cb783418692d92ab4",
+                    "nonce" : "0xedc230492e231f9b",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x3b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe66cee6f20dcacc71403229c40247be1b2210a6b506ffa5205979ce401327aaf",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b2ee21d7124905f66496ebc53eb32d03fefe385a703141d26cfd8ca487c15f2a0e66cee6f20dcacc71403229c40247be1b2210a6b506ffa5205979ce401327aafa0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a00fa89f560f212f258826f90507392b85184eb368c6029b0cb783418692d92ab488edc230492e231f9bf90108f90105010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0de0e589be9b99e79cbb7ce255194a1bca6f1a5030e308aeb89d99d5a26215326a0405f4eab564021adcb65367f740307fa9f9a229b93bb0f1ca53edbe4af34a939c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xde0e589be9b99e79cbb7ce255194a1bca6f1a5030e308aeb89d99d5a26215326",
+                        "s" : "0x405f4eab564021adcb65367f740307fa9f9a229b93bb0f1ca53edbe4af34a939",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8201261628cf245c1cf3cf67ef3f07ca61769adf099aed2fe4d61a0574827269",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0.json
index 18b047ca3..d7729b1d0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_1_0_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0Filler.json",
             "sourceHash" : "aecc9e16d832e086197b4408f1218b4123cf150e7c4d328dad1b2b6c5880269e"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x724707e3ca43882060c3594e3c960fd46a775789bc571f8494b4246a28746959",
-                    "mixHash" : "0xec5c2de88fc29c45bb23fddba5885a75ec4e9b0f9754c38544e6dfc6507d83a8",
-                    "nonce" : "0x17f12d1cdbccb743",
+                    "hash" : "0x28769de64935facd2ca8acfdac1a5d419f61b59cf9b72037a9cbf6903996c971",
+                    "mixHash" : "0x8471c72c6eb597ccc3459cf6b973206e45c7b37170de2b860a763a2ce9da8c50",
+                    "nonce" : "0xb0088ff8eef37128",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0ec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8aa09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0ec5c2de88fc29c45bb23fddba5885a75ec4e9b0f9754c38544e6dfc6507d83a88817f12d1cdbccb743f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0ffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8dfa00484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53c0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0ec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8aa09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a08471c72c6eb597ccc3459cf6b973206e45c7b37170de2b860a763a2ce9da8c5088b0088ff8eef37128f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0ffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8dfa00484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x724707e3ca43882060c3594e3c960fd46a775789bc571f8494b4246a28746959",
+        "lastblockhash" : "0x28769de64935facd2ca8acfdac1a5d419f61b59cf9b72037a9cbf6903996c971",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g1v0.json
index 7a73a41bf..f9f6e8ea8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g1v0Filler.json",
+            "sourceHash" : "72648917d75c2cdbf6d8453f6210bc230e126d2887f5f8e05a26df19cd58fd33"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x0d9c82deef6677485713b0d7ac76fd92990212b56d6ec4c4b4e71097053a9baa",
+                    "mixHash" : "0x4764795521d75034485dd0dbbee682c453ef52c5cf499072be9a1acc116ade0e",
+                    "nonce" : "0xde07ea18b1da50fc",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x77342150db1475011d4f8e6d6bc10b71fd64029ecfddfa4d60af210e79ebb5ee",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a077342150db1475011d4f8e6d6bc10b71fd64029ecfddfa4d60af210e79ebb5eea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a04764795521d75034485dd0dbbee682c453ef52c5cf499072be9a1acc116ade0e88de07ea18b1da50fcf90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba046532207f01e36451c39790e599fe47a7723a2c2feebc59f0296366542db7a22a01d84ea9efb68b9a725473b0c72149d8b8286fca65656f671ed991cd7588cfa0dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x46532207f01e36451c39790e599fe47a7723a2c2feebc59f0296366542db7a22",
+                        "s" : "0x1d84ea9efb68b9a725473b0c72149d8b8286fca65656f671ed991cd7588cfa0d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0d9c82deef6677485713b0d7ac76fd92990212b56d6ec4c4b4e71097053a9baa",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g2v0.json
index 7a73a41bf..9d274be41 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g2v0Filler.json",
+            "sourceHash" : "04b09d53bca14797b24aa42d389c85912422bc18b1b6fc8ffb60c33b3b264e9c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x57b4cc8ebdb5046d4da3ea5d397737460f2f0b783842a68aa4c19319c7ab9305",
+                    "mixHash" : "0xe3f848fd886863a6fa72f732e6ce7535b1248ed0ab84a46cd2727f8c0473c387",
+                    "nonce" : "0xfc77328392473155",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x591f2aa2e99431f5a8ee38441401a2cec792d6f9172e33598e687f0d3a752fe6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0591f2aa2e99431f5a8ee38441401a2cec792d6f9172e33598e687f0d3a752fe6a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0e3f848fd886863a6fa72f732e6ce7535b1248ed0ab84a46cd2727f8c0473c38788fc77328392473155f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba008d11cfd8e9c7f8a0c6bc23638566211869fd14fdfced3912d0fef7603768092a07147b6c651e28d723d7ead92d6087c2b4909c426c97c5fa5b6938556069de557c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x08d11cfd8e9c7f8a0c6bc23638566211869fd14fdfced3912d0fef7603768092",
+                        "s" : "0x7147b6c651e28d723d7ead92d6087c2b4909c426c97c5fa5b6938556069de557",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x57b4cc8ebdb5046d4da3ea5d397737460f2f0b783842a68aa4c19319c7ab9305",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g3v0.json
index 7a73a41bf..10396c217 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g3v0Filler.json",
+            "sourceHash" : "1040456082d171ac31f8482e75f319a19e89bbb4515bef4f64b1f502207a69ca"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x9d4dd7c5f31be1b1c66ee8cd3198c692d16d41bd8f7043cc0fff21e0492cabe6",
+                    "mixHash" : "0xd10afd15b69aa19a0b3cbd88186c8e2fc9a3ab6e5c802389d224ff0364a87964",
+                    "nonce" : "0x6cad8a6793a47747",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x43eb49821a009bfbded806f601ff91a0073360da8fa308975473ccd7234e8597",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a043eb49821a009bfbded806f601ff91a0073360da8fa308975473ccd7234e8597a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0d10afd15b69aa19a0b3cbd88186c8e2fc9a3ab6e5c802389d224ff0364a87964886cad8a6793a47747f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba027eb0568ded1f93b7537b512f2630c5c7e34122c5e2db4bb780f1b811fa4b4bfa05a1cb4eb3d73e4d186ee7c92769a9d6eca4c30cec8f976c9af9dc791f10281c2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x27eb0568ded1f93b7537b512f2630c5c7e34122c5e2db4bb780f1b811fa4b4bf",
+                        "s" : "0x5a1cb4eb3d73e4d186ee7c92769a9d6eca4c30cec8f976c9af9dc791f10281c2",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9d4dd7c5f31be1b1c66ee8cd3198c692d16d41bd8f7043cc0fff21e0492cabe6",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0.json
index 94070cb49..36db5b4a9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_1_0_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0Filler.json",
             "sourceHash" : "e88961e9da61fe1e2eddddd7eac1c0c3fa43a061e72769828d2ceee7580ff08b"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xd9fbc6928f947949cb205bb648aa1f6a5a415713bdf026af6c5f40ad0e7c460c",
-                    "mixHash" : "0xe3d3d1a10b50ba3836740e2c9b68fd66c9fb2407f7a76ad6373e587091a766fc",
-                    "nonce" : "0x0768c5f043177553",
+                    "hash" : "0x8a4797ce1bab5abb588d106f3ddbe1f7a9fc6ab08eed80491464a25aa05e1970",
+                    "mixHash" : "0x7dff64abe90652cb732da827b5e835413cd26cb504f20b851548c63dd10e0ff1",
+                    "nonce" : "0x84a7757b23cba3ef",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xd02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0d02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0e3d3d1a10b50ba3836740e2c9b68fd66c9fb2407f7a76ad6373e587091a766fc880768c5f043177553f90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0c5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9aa0381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0c0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0d02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a07dff64abe90652cb732da827b5e835413cd26cb504f20b851548c63dd10e0ff18884a7757b23cba3eff90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0c5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9aa0381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9fbc6928f947949cb205bb648aa1f6a5a415713bdf026af6c5f40ad0e7c460c",
+        "lastblockhash" : "0x8a4797ce1bab5abb588d106f3ddbe1f7a9fc6ab08eed80491464a25aa05e1970",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g1v0.json
index 7a73a41bf..0c5d12acd 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g1v0Filler.json",
+            "sourceHash" : "335369b36fd0fe662ece6ad0c74e6d503e13362c581e78343531e6f44858b794"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xb96e4741e8f820488e2d1f24a72496b27cf42e87bcdfeed43b7ce4144096e87a",
+                    "mixHash" : "0xb584f53234a92f9fd9121dcf08de131dd9c091630cc97bb904a73722a323fa6c",
+                    "nonce" : "0x3c8c478f3e72de9e",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x77342150db1475011d4f8e6d6bc10b71fd64029ecfddfa4d60af210e79ebb5ee",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a077342150db1475011d4f8e6d6bc10b71fd64029ecfddfa4d60af210e79ebb5eea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0b584f53234a92f9fd9121dcf08de131dd9c091630cc97bb904a73722a323fa6c883c8c478f3e72de9ef90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba046532207f01e36451c39790e599fe47a7723a2c2feebc59f0296366542db7a22a01d84ea9efb68b9a725473b0c72149d8b8286fca65656f671ed991cd7588cfa0dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x46532207f01e36451c39790e599fe47a7723a2c2feebc59f0296366542db7a22",
+                        "s" : "0x1d84ea9efb68b9a725473b0c72149d8b8286fca65656f671ed991cd7588cfa0d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb96e4741e8f820488e2d1f24a72496b27cf42e87bcdfeed43b7ce4144096e87a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g2v0.json
index 7a73a41bf..182f33601 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g2v0Filler.json",
+            "sourceHash" : "40415f58a3723857c918cc827ce5e240d00fd40093604736055167a3a510fb75"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x458e2a1007fb3ce5764b89463136b2ddf70ca04a6dc4185555c0befee5b05c4a",
+                    "mixHash" : "0xedca6db215090c45135a3cf83528951f8b1fd40fc82955b746944191c770d69e",
+                    "nonce" : "0x37d823ff14bac549",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x591f2aa2e99431f5a8ee38441401a2cec792d6f9172e33598e687f0d3a752fe6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0591f2aa2e99431f5a8ee38441401a2cec792d6f9172e33598e687f0d3a752fe6a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0edca6db215090c45135a3cf83528951f8b1fd40fc82955b746944191c770d69e8837d823ff14bac549f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba008d11cfd8e9c7f8a0c6bc23638566211869fd14fdfced3912d0fef7603768092a07147b6c651e28d723d7ead92d6087c2b4909c426c97c5fa5b6938556069de557c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x08d11cfd8e9c7f8a0c6bc23638566211869fd14fdfced3912d0fef7603768092",
+                        "s" : "0x7147b6c651e28d723d7ead92d6087c2b4909c426c97c5fa5b6938556069de557",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x458e2a1007fb3ce5764b89463136b2ddf70ca04a6dc4185555c0befee5b05c4a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g3v0.json
index 7a73a41bf..6260092f6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g3v0Filler.json",
+            "sourceHash" : "0ee1da6ced1f5c00076a3b4f1a053d04db17cc65f29908eb96491fa4c8f31bdb"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x8d61e7a364f9a7f785642e1e8c6da96d6c3052965275a2feab5e40c913c5b7c4",
+                    "mixHash" : "0x60f71f92718b91af872a649dc4f862783eb142244df4cab36e32f5d22915de60",
+                    "nonce" : "0x8af78cc0b294529a",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x43eb49821a009bfbded806f601ff91a0073360da8fa308975473ccd7234e8597",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a043eb49821a009bfbded806f601ff91a0073360da8fa308975473ccd7234e8597a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a060f71f92718b91af872a649dc4f862783eb142244df4cab36e32f5d22915de60888af78cc0b294529af90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba027eb0568ded1f93b7537b512f2630c5c7e34122c5e2db4bb780f1b811fa4b4bfa05a1cb4eb3d73e4d186ee7c92769a9d6eca4c30cec8f976c9af9dc791f10281c2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x27eb0568ded1f93b7537b512f2630c5c7e34122c5e2db4bb780f1b811fa4b4bf",
+                        "s" : "0x5a1cb4eb3d73e4d186ee7c92769a9d6eca4c30cec8f976c9af9dc791f10281c2",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8d61e7a364f9a7f785642e1e8c6da96d6c3052965275a2feab5e40c913c5b7c4",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0.json
index bcfbc81f7..0f26575ec 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_1_0_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0Filler.json",
             "sourceHash" : "306b3efcfedf345c221ae443c532cb303576b6b96626b4b84e4bcfa7e056f73b"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa72c",
-                    "hash" : "0x9ef4ae4cf1a31c0d89d72384c88dc7b7441c19d231e77be0796c29c5814e6c5d",
-                    "mixHash" : "0xa4ede8a9227bf246d48342b1497ba725677dc1bce1a8bee60ade7a5de0eed0fc",
-                    "nonce" : "0xa635df92e85afadc",
+                    "hash" : "0xc794c5a75f24d205cab19430e54321d37d20f08503463a1e34227cf42bb4f615",
+                    "mixHash" : "0x6d2ea2a1206e2b9b60435e84762a83a2ba47682cbff0f2d5411527029bba19b7",
+                    "nonce" : "0xe1ac5a940b4d0b50",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x55f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09657cb3862f296d042d3b8286ca6911d7b15b3523cac0eaec91c65d7fb86d4b1a0ff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659a055f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0a4ede8a9227bf246d48342b1497ba725677dc1bce1a8bee60ade7a5de0eed0fc88a635df92e85afadcf90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0e361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3a0223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09657cb3862f296d042d3b8286ca6911d7b15b3523cac0eaec91c65d7fb86d4b1a0ff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659a055f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a06d2ea2a1206e2b9b60435e84762a83a2ba47682cbff0f2d5411527029bba19b788e1ac5a940b4d0b50f90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0e361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3a0223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ef4ae4cf1a31c0d89d72384c88dc7b7441c19d231e77be0796c29c5814e6c5d",
+        "lastblockhash" : "0xc794c5a75f24d205cab19430e54321d37d20f08503463a1e34227cf42bb4f615",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g1v0.json
index 7a73a41bf..1a8ec000b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g1v0Filler.json",
+            "sourceHash" : "eb589f57ac29ac0854718b5c5a00184ae602e9b717b84f5979b403bbfc5c4d3b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x6453b1c1fcc3be55a70ca2525f040bc8d22726c0b41cbab7375cc54df449b263",
+                    "mixHash" : "0xce61714d75cfb4d960af9b9afe14eb54f6309b48a0f8d1bcc59269a015e35a4e",
+                    "nonce" : "0xcf197feb39b552b3",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x77342150db1475011d4f8e6d6bc10b71fd64029ecfddfa4d60af210e79ebb5ee",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a077342150db1475011d4f8e6d6bc10b71fd64029ecfddfa4d60af210e79ebb5eea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0ce61714d75cfb4d960af9b9afe14eb54f6309b48a0f8d1bcc59269a015e35a4e88cf197feb39b552b3f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba046532207f01e36451c39790e599fe47a7723a2c2feebc59f0296366542db7a22a01d84ea9efb68b9a725473b0c72149d8b8286fca65656f671ed991cd7588cfa0dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x46532207f01e36451c39790e599fe47a7723a2c2feebc59f0296366542db7a22",
+                        "s" : "0x1d84ea9efb68b9a725473b0c72149d8b8286fca65656f671ed991cd7588cfa0d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6453b1c1fcc3be55a70ca2525f040bc8d22726c0b41cbab7375cc54df449b263",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g2v0.json
index 7a73a41bf..bdd08f98e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g2v0Filler.json",
+            "sourceHash" : "0fa3278ed8c8b26e744d7f4cd313279e88e80e25dfefbfb83397a0b98ed3d8b8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x0b99a40baa77978eda62a5b60aa9a56cf80cd415968d4d7cabfd8150db3a34a0",
+                    "mixHash" : "0x92a766a0d538234d1d9d23d8048d6231bda0778eae52a125872cce3e5fbe2c06",
+                    "nonce" : "0x54c059be93e1ac61",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x591f2aa2e99431f5a8ee38441401a2cec792d6f9172e33598e687f0d3a752fe6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0591f2aa2e99431f5a8ee38441401a2cec792d6f9172e33598e687f0d3a752fe6a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a092a766a0d538234d1d9d23d8048d6231bda0778eae52a125872cce3e5fbe2c068854c059be93e1ac61f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba008d11cfd8e9c7f8a0c6bc23638566211869fd14fdfced3912d0fef7603768092a07147b6c651e28d723d7ead92d6087c2b4909c426c97c5fa5b6938556069de557c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x08d11cfd8e9c7f8a0c6bc23638566211869fd14fdfced3912d0fef7603768092",
+                        "s" : "0x7147b6c651e28d723d7ead92d6087c2b4909c426c97c5fa5b6938556069de557",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0b99a40baa77978eda62a5b60aa9a56cf80cd415968d4d7cabfd8150db3a34a0",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g3v0.json
index 7a73a41bf..9f711851c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g3v0Filler.json",
+            "sourceHash" : "d79a8426f60fb1ea3d441630e696ccb7f2e44d04adcddf2c1ac18f5d2dd716a7"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x866fe08fcca947933bf293a422b7c84e73c3b668ddf0e949c7d905a63cbfc8b3",
+                    "mixHash" : "0x0213f8c4b49d530750cc5acd2552a85ae26f8f9d3cab40c7d6bff590129515ca",
+                    "nonce" : "0xfdfb3d43a6b208d0",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x43eb49821a009bfbded806f601ff91a0073360da8fa308975473ccd7234e8597",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a043eb49821a009bfbded806f601ff91a0073360da8fa308975473ccd7234e8597a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a00213f8c4b49d530750cc5acd2552a85ae26f8f9d3cab40c7d6bff590129515ca88fdfb3d43a6b208d0f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba027eb0568ded1f93b7537b512f2630c5c7e34122c5e2db4bb780f1b811fa4b4bfa05a1cb4eb3d73e4d186ee7c92769a9d6eca4c30cec8f976c9af9dc791f10281c2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x27eb0568ded1f93b7537b512f2630c5c7e34122c5e2db4bb780f1b811fa4b4bf",
+                        "s" : "0x5a1cb4eb3d73e4d186ee7c92769a9d6eca4c30cec8f976c9af9dc791f10281c2",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x866fe08fcca947933bf293a422b7c84e73c3b668ddf0e949c7d905a63cbfc8b3",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0.json
index d10477f6a..4f021df2d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_1_0_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0Filler.json",
             "sourceHash" : "179f5a06db3359bcda8dc235a5a332e388b4c800cc2499048ce4ed5f0ee872ed"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xf45c92a27e362ead3c25d5c99909375e3c79168079857089b239f6644f833ada",
-                    "mixHash" : "0x9cae4e4e2e5312b18cef7957bbebe2e14d7b5498edf60c2d9ab9a308bcfa04c2",
-                    "nonce" : "0xd74c1fee83324027",
+                    "hash" : "0xa5c41326c109b97b984a3da8cd608891ac00e09ca9c1de0c44cd2385ca03d33a",
+                    "mixHash" : "0x8414ea27c458750365c6e1e5dd7acb5a4b3c62b20abf5fd73966d5e23bbb244b",
+                    "nonce" : "0xa1ea16d83a61ffec",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x4d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a04d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844ea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a09cae4e4e2e5312b18cef7957bbebe2e14d7b5498edf60c2d9ab9a308bcfa04c288d74c1fee83324027f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca06598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054a064dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53eac0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a04d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844ea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a08414ea27c458750365c6e1e5dd7acb5a4b3c62b20abf5fd73966d5e23bbb244b88a1ea16d83a61ffecf90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca06598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054a064dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53eac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf45c92a27e362ead3c25d5c99909375e3c79168079857089b239f6644f833ada",
+        "lastblockhash" : "0xa5c41326c109b97b984a3da8cd608891ac00e09ca9c1de0c44cd2385ca03d33a",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g1v0.json
index 7a73a41bf..da5441479 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g1v0Filler.json",
+            "sourceHash" : "121f5d53994f1619c6f86738a6d15ba52d61c776cf8176e10ffd0f06cc21638e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x7a45111b5ab02e35c4933bbae5251b7c0618134e80a09b405317d1db4f672d21",
+                    "mixHash" : "0x6fac5c561b4ecdf306eac63800e0a29c154d50582deef04a6e91516cfd1188bc",
+                    "nonce" : "0xd88201e8eb5a67f8",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x77342150db1475011d4f8e6d6bc10b71fd64029ecfddfa4d60af210e79ebb5ee",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a077342150db1475011d4f8e6d6bc10b71fd64029ecfddfa4d60af210e79ebb5eea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a06fac5c561b4ecdf306eac63800e0a29c154d50582deef04a6e91516cfd1188bc88d88201e8eb5a67f8f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba046532207f01e36451c39790e599fe47a7723a2c2feebc59f0296366542db7a22a01d84ea9efb68b9a725473b0c72149d8b8286fca65656f671ed991cd7588cfa0dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x46532207f01e36451c39790e599fe47a7723a2c2feebc59f0296366542db7a22",
+                        "s" : "0x1d84ea9efb68b9a725473b0c72149d8b8286fca65656f671ed991cd7588cfa0d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7a45111b5ab02e35c4933bbae5251b7c0618134e80a09b405317d1db4f672d21",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g2v0.json
index 7a73a41bf..6c11939d9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g2v0Filler.json",
+            "sourceHash" : "0f8c4baddea1050d9cf4a2904d7657a8b6e874bc0e62f1899754914fd2553963"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xe1d143a6e9964db36629dbc1b5b81567f07298da1b914acfb30b15b10e609b4e",
+                    "mixHash" : "0xf08122d0f3daf30b73147ce0705b4ddfc3bfb5408a7350431c048f313ed07527",
+                    "nonce" : "0xd660ddea6f37d8b4",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x591f2aa2e99431f5a8ee38441401a2cec792d6f9172e33598e687f0d3a752fe6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0591f2aa2e99431f5a8ee38441401a2cec792d6f9172e33598e687f0d3a752fe6a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0f08122d0f3daf30b73147ce0705b4ddfc3bfb5408a7350431c048f313ed0752788d660ddea6f37d8b4f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba008d11cfd8e9c7f8a0c6bc23638566211869fd14fdfced3912d0fef7603768092a07147b6c651e28d723d7ead92d6087c2b4909c426c97c5fa5b6938556069de557c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x08d11cfd8e9c7f8a0c6bc23638566211869fd14fdfced3912d0fef7603768092",
+                        "s" : "0x7147b6c651e28d723d7ead92d6087c2b4909c426c97c5fa5b6938556069de557",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe1d143a6e9964db36629dbc1b5b81567f07298da1b914acfb30b15b10e609b4e",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g3v0.json
index 7a73a41bf..76f9c24f9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g3v0Filler.json",
+            "sourceHash" : "0da29d36feb064c13c5ed565091ef32584ed77ba4ff923636bde154010364b85"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x7a06ef240be3ad14ea749b7042b76f93c12a4b5f9a21589661a47856b385afb6",
+                    "mixHash" : "0xd75d53f93c882514f2d07fb44264fc8b3c253fe24baa7654e8be2a91e6507331",
+                    "nonce" : "0xa8524085047dac32",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x43eb49821a009bfbded806f601ff91a0073360da8fa308975473ccd7234e8597",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a043eb49821a009bfbded806f601ff91a0073360da8fa308975473ccd7234e8597a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0d75d53f93c882514f2d07fb44264fc8b3c253fe24baa7654e8be2a91e650733188a8524085047dac32f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba027eb0568ded1f93b7537b512f2630c5c7e34122c5e2db4bb780f1b811fa4b4bfa05a1cb4eb3d73e4d186ee7c92769a9d6eca4c30cec8f976c9af9dc791f10281c2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x27eb0568ded1f93b7537b512f2630c5c7e34122c5e2db4bb780f1b811fa4b4bf",
+                        "s" : "0x5a1cb4eb3d73e4d186ee7c92769a9d6eca4c30cec8f976c9af9dc791f10281c2",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7a06ef240be3ad14ea749b7042b76f93c12a4b5f9a21589661a47856b385afb6",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0.json
index 3c93468c4..e2c8d0717 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_1_0_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0Filler.json",
             "sourceHash" : "deb0b849e9a80f9aac58e35c71b8b7abee2d09cacacee83a69557bb971950b00"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xa2e49014493714f5fcbf7aa7e296cd42a9f03d0d86a0b50c5fb219c3bfcb0108",
-                    "mixHash" : "0xc24087a70f59fc2a5d5d3d6d019ff19a267422eb215c27dac7de48b1d540f70a",
-                    "nonce" : "0xd0ade87f5c90ceb9",
+                    "hash" : "0x2fc8cc60309452d6e518df7750109d9f8331b0b39434554957c5d04002e7a470",
+                    "mixHash" : "0xe71733574917a73ed0c3b998ac532643054401533665733ea868885d7adae022",
+                    "nonce" : "0x5091e7ec8af48075",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x23a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a023a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0c24087a70f59fc2a5d5d3d6d019ff19a267422eb215c27dac7de48b1d540f70a88d0ade87f5c90ceb9f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba01e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3fa018b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8bc0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a023a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0e71733574917a73ed0c3b998ac532643054401533665733ea868885d7adae022885091e7ec8af48075f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba01e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3fa018b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2e49014493714f5fcbf7aa7e296cd42a9f03d0d86a0b50c5fb219c3bfcb0108",
+        "lastblockhash" : "0x2fc8cc60309452d6e518df7750109d9f8331b0b39434554957c5d04002e7a470",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g1v0.json
index 7a73a41bf..5a6f83383 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g1v0Filler.json",
+            "sourceHash" : "0a6859e36529d76e8680a29f2786949593cadbcbbb2e0936a6f750142a5ccf52"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x4cc1c246575f51670e4f837afea68ee6653b40c7998026ba47427ceabc8b9003",
+                    "mixHash" : "0x060b8827c844c4f5cd500f65e17d72fa1ca31830de0887e5afbc2e687c4daac3",
+                    "nonce" : "0x9791536b65995eaa",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x77342150db1475011d4f8e6d6bc10b71fd64029ecfddfa4d60af210e79ebb5ee",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a077342150db1475011d4f8e6d6bc10b71fd64029ecfddfa4d60af210e79ebb5eea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0060b8827c844c4f5cd500f65e17d72fa1ca31830de0887e5afbc2e687c4daac3889791536b65995eaaf90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba046532207f01e36451c39790e599fe47a7723a2c2feebc59f0296366542db7a22a01d84ea9efb68b9a725473b0c72149d8b8286fca65656f671ed991cd7588cfa0dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x46532207f01e36451c39790e599fe47a7723a2c2feebc59f0296366542db7a22",
+                        "s" : "0x1d84ea9efb68b9a725473b0c72149d8b8286fca65656f671ed991cd7588cfa0d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4cc1c246575f51670e4f837afea68ee6653b40c7998026ba47427ceabc8b9003",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g2v0.json
index 7a73a41bf..765fca4f9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g2v0Filler.json",
+            "sourceHash" : "8d400b4d4abe49cb05be7dc885dff83fccc18a72fb4aaa76ed272b0e5487f620"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xf287962b26586e2f231d21bc329b8ead84bb1c973df772c93955edd9c5c408a7",
+                    "mixHash" : "0x2c68c57d3278152804a15bb90ac3bd3034312a3900b705bdbc6feea9ebf1be0e",
+                    "nonce" : "0xaaf09601ffb2df8a",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x591f2aa2e99431f5a8ee38441401a2cec792d6f9172e33598e687f0d3a752fe6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0591f2aa2e99431f5a8ee38441401a2cec792d6f9172e33598e687f0d3a752fe6a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a02c68c57d3278152804a15bb90ac3bd3034312a3900b705bdbc6feea9ebf1be0e88aaf09601ffb2df8af90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba008d11cfd8e9c7f8a0c6bc23638566211869fd14fdfced3912d0fef7603768092a07147b6c651e28d723d7ead92d6087c2b4909c426c97c5fa5b6938556069de557c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x08d11cfd8e9c7f8a0c6bc23638566211869fd14fdfced3912d0fef7603768092",
+                        "s" : "0x7147b6c651e28d723d7ead92d6087c2b4909c426c97c5fa5b6938556069de557",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf287962b26586e2f231d21bc329b8ead84bb1c973df772c93955edd9c5c408a7",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g3v0.json
index 7a73a41bf..dfba7d757 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g3v0Filler.json",
+            "sourceHash" : "b833d890b1f3b7a39411587980bb57cff01b66861d23b91f76867be37ba38d78"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xa180e52c52ddd255b3e098f292dde935b4a3f953bcca1c77db34b09924643ff8",
+                    "mixHash" : "0x65eb66bf07484499157b709e7e45966f1259f897953e930d139ec79a6909db69",
+                    "nonce" : "0xbccf878e1787e191",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x43eb49821a009bfbded806f601ff91a0073360da8fa308975473ccd7234e8597",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a043eb49821a009bfbded806f601ff91a0073360da8fa308975473ccd7234e8597a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a065eb66bf07484499157b709e7e45966f1259f897953e930d139ec79a6909db6988bccf878e1787e191f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba027eb0568ded1f93b7537b512f2630c5c7e34122c5e2db4bb780f1b811fa4b4bfa05a1cb4eb3d73e4d186ee7c92769a9d6eca4c30cec8f976c9af9dc791f10281c2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x27eb0568ded1f93b7537b512f2630c5c7e34122c5e2db4bb780f1b811fa4b4bf",
+                        "s" : "0x5a1cb4eb3d73e4d186ee7c92769a9d6eca4c30cec8f976c9af9dc791f10281c2",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa180e52c52ddd255b3e098f292dde935b4a3f953bcca1c77db34b09924643ff8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0.json
index e9289badc..255a2daf5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_1_0_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0Filler.json",
             "sourceHash" : "330da61b1105a8efe9e69450f94a79f2e4a66d8989f122c407dc014376ed291c"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xd783efa78d76a53a579984b25cc51b8ec7f2c605d99b73e9cf1c687d46fc293a",
-                    "mixHash" : "0x6fde049998342134bb48594dd068939466aa09a6b8509ae9950937e8be05f8dd",
-                    "nonce" : "0xe4ea1c363ec07083",
+                    "hash" : "0x2d9f4ae0bf6732b4f05e6c9a39580b928a1b9634dd661b731f24f6189403e246",
+                    "mixHash" : "0x0d93d9f7d8198055324159756a6197fd35f9e64e6df9f8c31376c3836899b9ad",
+                    "nonce" : "0xf640949400e01bf4",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x49bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a049bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a06fde049998342134bb48594dd068939466aa09a6b8509ae9950937e8be05f8dd88e4ea1c363ec07083f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0c9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43fa06cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a049bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a00d93d9f7d8198055324159756a6197fd35f9e64e6df9f8c31376c3836899b9ad88f640949400e01bf4f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0c9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43fa06cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd783efa78d76a53a579984b25cc51b8ec7f2c605d99b73e9cf1c687d46fc293a",
+        "lastblockhash" : "0x2d9f4ae0bf6732b4f05e6c9a39580b928a1b9634dd661b731f24f6189403e246",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g1v0.json
index 7a73a41bf..b7bcfe8cf 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g1v0Filler.json",
+            "sourceHash" : "e9e03ea034b99c90f38ed1641965e0cff7ce9a7c8844735a25e56ef8340bd2c3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x91c38d5c306e463559db62442526633a1e35df15086469cc48f6094ffce9aba3",
+                    "mixHash" : "0xbb8d8121bd171c9466fe8dbb53009e494d6328a379b59f93d30e5e8774c6a690",
+                    "nonce" : "0xa2888de9358470df",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x77342150db1475011d4f8e6d6bc10b71fd64029ecfddfa4d60af210e79ebb5ee",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a077342150db1475011d4f8e6d6bc10b71fd64029ecfddfa4d60af210e79ebb5eea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0bb8d8121bd171c9466fe8dbb53009e494d6328a379b59f93d30e5e8774c6a69088a2888de9358470dff90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba046532207f01e36451c39790e599fe47a7723a2c2feebc59f0296366542db7a22a01d84ea9efb68b9a725473b0c72149d8b8286fca65656f671ed991cd7588cfa0dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x46532207f01e36451c39790e599fe47a7723a2c2feebc59f0296366542db7a22",
+                        "s" : "0x1d84ea9efb68b9a725473b0c72149d8b8286fca65656f671ed991cd7588cfa0d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x91c38d5c306e463559db62442526633a1e35df15086469cc48f6094ffce9aba3",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g2v0.json
index 7a73a41bf..e6cc85e35 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g2v0Filler.json",
+            "sourceHash" : "0999117aea7477857f69b996e4557199693def58bcf59be9afe6d750902f76b1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x8b6248f1e6d6b4050ee852b299c80ce3f9fa15e31a203182a780d5f60ab14e13",
+                    "mixHash" : "0xf015941e44eac4789bf39f82216bb19be2ccb97cacd1a9ca9bc6c8dd4da44608",
+                    "nonce" : "0xccf4ea2505c39ebf",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x591f2aa2e99431f5a8ee38441401a2cec792d6f9172e33598e687f0d3a752fe6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0591f2aa2e99431f5a8ee38441401a2cec792d6f9172e33598e687f0d3a752fe6a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0f015941e44eac4789bf39f82216bb19be2ccb97cacd1a9ca9bc6c8dd4da4460888ccf4ea2505c39ebff90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba008d11cfd8e9c7f8a0c6bc23638566211869fd14fdfced3912d0fef7603768092a07147b6c651e28d723d7ead92d6087c2b4909c426c97c5fa5b6938556069de557c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x08d11cfd8e9c7f8a0c6bc23638566211869fd14fdfced3912d0fef7603768092",
+                        "s" : "0x7147b6c651e28d723d7ead92d6087c2b4909c426c97c5fa5b6938556069de557",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8b6248f1e6d6b4050ee852b299c80ce3f9fa15e31a203182a780d5f60ab14e13",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g3v0.json
index 7a73a41bf..94cea6f34 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_1_0_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g3v0Filler.json",
+            "sourceHash" : "7f292f797136fe42052792f12791ee80a2e47da9b2386048311d8357ccad25e7"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xc00421d419e5188f0cb56d8045246a5ea8d203bb0308b4dca7efe177fb4321a5",
+                    "mixHash" : "0x9ac72b9c035955a03133590e5e44f5908fe56c9f996b05b1cc9e7bb27e353436",
+                    "nonce" : "0x4fbc8b9713818545",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x43eb49821a009bfbded806f601ff91a0073360da8fa308975473ccd7234e8597",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a043eb49821a009bfbded806f601ff91a0073360da8fa308975473ccd7234e8597a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a09ac72b9c035955a03133590e5e44f5908fe56c9f996b05b1cc9e7bb27e353436884fbc8b9713818545f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba027eb0568ded1f93b7537b512f2630c5c7e34122c5e2db4bb780f1b811fa4b4bfa05a1cb4eb3d73e4d186ee7c92769a9d6eca4c30cec8f976c9af9dc791f10281c2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x27eb0568ded1f93b7537b512f2630c5c7e34122c5e2db4bb780f1b811fa4b4bf",
+                        "s" : "0x5a1cb4eb3d73e4d186ee7c92769a9d6eca4c30cec8f976c9af9dc791f10281c2",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc00421d419e5188f0cb56d8045246a5ea8d203bb0308b4dca7efe177fb4321a5",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0.json
index 8c4c5d2d4..35142b672 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_3_100_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0Filler.json",
             "sourceHash" : "c8359462a2493ae132d8bbb67c0bd1fec64b3a4e88dfad36dc134c16ff8c4e7c"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x5419c1a63d7d9ca4922a743354ec0c3602fbcf287a7410cc0219fd9b767e2af6",
-                    "mixHash" : "0x37c2587509a1cb317d225c8833805b957fbd2ac56b11e6d9ade8f30454b580b7",
-                    "nonce" : "0x350e9170bc7ddb27",
+                    "hash" : "0x63e30c74b05fa22a3a021d7fa6538660a736d57a40d54d92270ae36d8c893a35",
+                    "mixHash" : "0xcba8841b4559da60636a5bc63b303d86db23d5534eadbe193490ce75b52eb583",
+                    "nonce" : "0x3a686ba2f4506a10",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xc87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0c87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a037c2587509a1cb317d225c8833805b957fbd2ac56b11e6d9ade8f30454b580b788350e9170bc7ddb27f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca005e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0ca014bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5dc0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0c87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0cba8841b4559da60636a5bc63b303d86db23d5534eadbe193490ce75b52eb583883a686ba2f4506a10f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca005e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0ca014bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5419c1a63d7d9ca4922a743354ec0c3602fbcf287a7410cc0219fd9b767e2af6",
+        "lastblockhash" : "0x63e30c74b05fa22a3a021d7fa6538660a736d57a40d54d92270ae36d8c893a35",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g1v0.json
index 7a73a41bf..efb04980f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g1v0Filler.json",
+            "sourceHash" : "9e20fbdcdd46114bf5ff32719f70ed75cf267d7b3bdd97fa0e56254f3c20c2fc"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xda122b2f0e194216514fdd93c61ff84375b2cf6cedc92d45a9bc55e607663e9e",
+                    "mixHash" : "0x907e742218a6b12d9d07433c87b546b03b1184b41cee6b6be0a837893c86def8",
+                    "nonce" : "0x33f911be8169b9f2",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x52fb41494ffbab8ea9dc4e7de20465cdcec95f75b6e414e78dd36af187a08bad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa052fb41494ffbab8ea9dc4e7de20465cdcec95f75b6e414e78dd36af187a08bada0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0907e742218a6b12d9d07433c87b546b03b1184b41cee6b6be0a837893c86def88833f911be8169b9f2f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca051c72809f8b6c0c9dd8b06f5a055f8d64b183aae9431a99886a5d6e200e5d41aa0300e70347077b0bdad01a9795f03520d7e27c1cb53029a665af7384aa175116ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x51c72809f8b6c0c9dd8b06f5a055f8d64b183aae9431a99886a5d6e200e5d41a",
+                        "s" : "0x300e70347077b0bdad01a9795f03520d7e27c1cb53029a665af7384aa175116e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xda122b2f0e194216514fdd93c61ff84375b2cf6cedc92d45a9bc55e607663e9e",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g2v0.json
index 7a73a41bf..653f8d9f2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g2v0Filler.json",
+            "sourceHash" : "799068f605b8a8f8c8d9526a3bd3674ad96ff938eb9419db58b93fb964cf51fd"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x97b34f8869c644ad37cc87e72ba45681207b39f834888d53e107de1bc0f5397b",
+                    "mixHash" : "0xa8e99f575251675f0aaf1efa36909d4e3fe2332b89a12ad3f7fc477d06ab4f87",
+                    "nonce" : "0x02e8e1fb6b509742",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xae1a82b7c7c163b9183fef3fa91b11763a9a64cd183b4094765aebebd262ec38",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0ae1a82b7c7c163b9183fef3fa91b11763a9a64cd183b4094765aebebd262ec38a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0a8e99f575251675f0aaf1efa36909d4e3fe2332b89a12ad3f7fc477d06ab4f878802e8e1fb6b509742f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca08267f052cd65e6e81d6839b98fe6d87505aac350d8018f5a23895f701164650ba037c421c870d8b01c12415e26675872e89bcd9dde4c623db53a494dec5df533edc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x8267f052cd65e6e81d6839b98fe6d87505aac350d8018f5a23895f701164650b",
+                        "s" : "0x37c421c870d8b01c12415e26675872e89bcd9dde4c623db53a494dec5df533ed",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x97b34f8869c644ad37cc87e72ba45681207b39f834888d53e107de1bc0f5397b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g3v0.json
index 7a73a41bf..40f9fb47b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g3v0Filler.json",
+            "sourceHash" : "39b76e02e3694bdac24b81a8132bfc11bed9a9239bb476c9a768b84bed6bd5d8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xd5799e66639c4456b9769a65289088f7e667da9b5fbcf908c375c47d14e23dd7",
+                    "mixHash" : "0x75bf0b5d3e86d3fcfe771ccc7aa7df333399b164bc9abe66e9055a5f4885980f",
+                    "nonce" : "0x87e4bdd9821cd808",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd908138f87a967ade42cef98322e836921ee3d0cc7fe54a952ffef12c3d89db",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0fd908138f87a967ade42cef98322e836921ee3d0cc7fe54a952ffef12c3d89dba0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a075bf0b5d3e86d3fcfe771ccc7aa7df333399b164bc9abe66e9055a5f4885980f8887e4bdd9821cd808f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0da55d964eeb5c7bcbfa8c862460997fcf1b953d1501e918f23d21ac95eeff6bda00529106d03cfb1dab7735c9934d747d71f1a38a5ca3eef0a33450d1a9f678cf2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xda55d964eeb5c7bcbfa8c862460997fcf1b953d1501e918f23d21ac95eeff6bd",
+                        "s" : "0x0529106d03cfb1dab7735c9934d747d71f1a38a5ca3eef0a33450d1a9f678cf2",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd5799e66639c4456b9769a65289088f7e667da9b5fbcf908c375c47d14e23dd7",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0.json
index bab87eb4f..92907b483 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_3_100_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0Filler.json",
             "sourceHash" : "55d6e1320a4f23b4e21b1cd46be4f9eebd54559a857d858fb57b9a77cda2982d"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x52f5245c2b757589e86828d5334700549a19d3a6e9343974a9082dd7297ddb29",
-                    "mixHash" : "0x29dfbbf7ed4a72cfad8cc9636f818c6a3fdaff0e34d71aceeda1867e09634791",
-                    "nonce" : "0x64df39d43531348f",
+                    "hash" : "0x1c28423822d3f422e879b0bdba325ba6791358de5f22d59f3e475705076e12fc",
+                    "mixHash" : "0x0c2b72b1517ec2aa0be273a6f1d237e163ba3b3745811d17514efa85ca1c216d",
+                    "nonce" : "0x8db487517643e515",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a029dfbbf7ed4a72cfad8cc9636f818c6a3fdaff0e34d71aceeda1867e096347918864df39d43531348ff90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca070ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7a05a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68bc0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a00c2b72b1517ec2aa0be273a6f1d237e163ba3b3745811d17514efa85ca1c216d888db487517643e515f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca070ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7a05a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x52f5245c2b757589e86828d5334700549a19d3a6e9343974a9082dd7297ddb29",
+        "lastblockhash" : "0x1c28423822d3f422e879b0bdba325ba6791358de5f22d59f3e475705076e12fc",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g1v0.json
index 7a73a41bf..e7e87ee3c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g1v0Filler.json",
+            "sourceHash" : "e925a73cb03f514f43a82a36d8e31bdc09760b797f5df8130b8adfedd3b959ac"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xd5510ef41a71ead1fcdd0cf696d897358c5f1a876d3faed809f93ee293e3d652",
+                    "mixHash" : "0x3cc7e1c749b18512099bb1ccb642cee4116233f1bfd3becbcaac8ec8254b3b86",
+                    "nonce" : "0x4ff93b4d3f42c454",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x52fb41494ffbab8ea9dc4e7de20465cdcec95f75b6e414e78dd36af187a08bad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa052fb41494ffbab8ea9dc4e7de20465cdcec95f75b6e414e78dd36af187a08bada0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a03cc7e1c749b18512099bb1ccb642cee4116233f1bfd3becbcaac8ec8254b3b86884ff93b4d3f42c454f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca051c72809f8b6c0c9dd8b06f5a055f8d64b183aae9431a99886a5d6e200e5d41aa0300e70347077b0bdad01a9795f03520d7e27c1cb53029a665af7384aa175116ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x51c72809f8b6c0c9dd8b06f5a055f8d64b183aae9431a99886a5d6e200e5d41a",
+                        "s" : "0x300e70347077b0bdad01a9795f03520d7e27c1cb53029a665af7384aa175116e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd5510ef41a71ead1fcdd0cf696d897358c5f1a876d3faed809f93ee293e3d652",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g2v0.json
index 7a73a41bf..5300bc729 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g2v0Filler.json",
+            "sourceHash" : "726eae9de89d3553fdd23101981c0420ef1808b0276317d99c487baa005d7fde"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x22a88f8eb3e9c91c31e582f3fbb48089944f79f1f121e2f3d265d30a0997ac1c",
+                    "mixHash" : "0x980433ed2faa1edeffbc4ab6c1e72a78caf35ac08a986a7eff51152335f4eed8",
+                    "nonce" : "0xdce411f71334f6c4",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xae1a82b7c7c163b9183fef3fa91b11763a9a64cd183b4094765aebebd262ec38",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0ae1a82b7c7c163b9183fef3fa91b11763a9a64cd183b4094765aebebd262ec38a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0980433ed2faa1edeffbc4ab6c1e72a78caf35ac08a986a7eff51152335f4eed888dce411f71334f6c4f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca08267f052cd65e6e81d6839b98fe6d87505aac350d8018f5a23895f701164650ba037c421c870d8b01c12415e26675872e89bcd9dde4c623db53a494dec5df533edc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x8267f052cd65e6e81d6839b98fe6d87505aac350d8018f5a23895f701164650b",
+                        "s" : "0x37c421c870d8b01c12415e26675872e89bcd9dde4c623db53a494dec5df533ed",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x22a88f8eb3e9c91c31e582f3fbb48089944f79f1f121e2f3d265d30a0997ac1c",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g3v0.json
index 7a73a41bf..a44123ad0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g3v0Filler.json",
+            "sourceHash" : "f3aa713c1ba640ecaa1fca3c876a149f197bfde54fe9629338c1942b423206fb"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x9689481b78c6c18ab94f97d5a6214d1fbc10611600840fb9ff393be7e4b3846d",
+                    "mixHash" : "0x8bdbdbffb4f804fdc27067c3dbd72ebbcbd80fd5d2083edf25345ec643a33fed",
+                    "nonce" : "0x28a49fe5d07ebba6",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd908138f87a967ade42cef98322e836921ee3d0cc7fe54a952ffef12c3d89db",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0fd908138f87a967ade42cef98322e836921ee3d0cc7fe54a952ffef12c3d89dba0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a08bdbdbffb4f804fdc27067c3dbd72ebbcbd80fd5d2083edf25345ec643a33fed8828a49fe5d07ebba6f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0da55d964eeb5c7bcbfa8c862460997fcf1b953d1501e918f23d21ac95eeff6bda00529106d03cfb1dab7735c9934d747d71f1a38a5ca3eef0a33450d1a9f678cf2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xda55d964eeb5c7bcbfa8c862460997fcf1b953d1501e918f23d21ac95eeff6bd",
+                        "s" : "0x0529106d03cfb1dab7735c9934d747d71f1a38a5ca3eef0a33450d1a9f678cf2",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9689481b78c6c18ab94f97d5a6214d1fbc10611600840fb9ff393be7e4b3846d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0.json
index b0f2cd521..685e8b119 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_3_100_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0Filler.json",
             "sourceHash" : "1dc57e46f27f63e588c8e6fb0054eadd906b729ffd72c4b0fdef4e396cff0af7"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7ac",
-                    "hash" : "0xdf4c91aeb9b305c8d66fe9adddfca3e5d85b4f19e626663b26532ba6de5560db",
-                    "mixHash" : "0xd4237c1e465c51410cae767185ac51c35ef7e0f684a5810dc48a72172a1e90f3",
-                    "nonce" : "0x0f92d3946404344d",
+                    "hash" : "0x23d2cdeb37bae1367046f9b00ee89d7e127b39d1831aad998ce31c6482f534b5",
+                    "mixHash" : "0xde780ef7e5ef035b9b8aea335c7d3e1824c23f3f0cb5ad9586e7f8d8497f4579",
+                    "nonce" : "0x5b5cf2ee15cbd63b",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x6f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271db",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0504d51782c0ac6c9f4146fceac1a238df050ab83ece4749430e4f23222a25710a0769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4ea06f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271dbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0d4237c1e465c51410cae767185ac51c35ef7e0f684a5810dc48a72172a1e90f3880f92d3946404344df90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca0c58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3a0599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0504d51782c0ac6c9f4146fceac1a238df050ab83ece4749430e4f23222a25710a0769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4ea06f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271dbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0de780ef7e5ef035b9b8aea335c7d3e1824c23f3f0cb5ad9586e7f8d8497f4579885b5cf2ee15cbd63bf90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca0c58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3a0599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf4c91aeb9b305c8d66fe9adddfca3e5d85b4f19e626663b26532ba6de5560db",
+        "lastblockhash" : "0x23d2cdeb37bae1367046f9b00ee89d7e127b39d1831aad998ce31c6482f534b5",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g1v0.json
index 7a73a41bf..571a6f6ec 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g1v0Filler.json",
+            "sourceHash" : "b9e3df66dd8fc7e491fc8a3f4224ecd883a26f9f8c0fb81d3dc6e24465eec378"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x102e7b720adb6c24189a9d8c3cb4c56d724384514edaef385aed6f73292fbe44",
+                    "mixHash" : "0xc10e9082d86298390572bdbe9ed18661fb4e4874215f7da4e095f99e0e322a06",
+                    "nonce" : "0x4f827aef386eda35",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x52fb41494ffbab8ea9dc4e7de20465cdcec95f75b6e414e78dd36af187a08bad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa052fb41494ffbab8ea9dc4e7de20465cdcec95f75b6e414e78dd36af187a08bada0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0c10e9082d86298390572bdbe9ed18661fb4e4874215f7da4e095f99e0e322a06884f827aef386eda35f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca051c72809f8b6c0c9dd8b06f5a055f8d64b183aae9431a99886a5d6e200e5d41aa0300e70347077b0bdad01a9795f03520d7e27c1cb53029a665af7384aa175116ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x51c72809f8b6c0c9dd8b06f5a055f8d64b183aae9431a99886a5d6e200e5d41a",
+                        "s" : "0x300e70347077b0bdad01a9795f03520d7e27c1cb53029a665af7384aa175116e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x102e7b720adb6c24189a9d8c3cb4c56d724384514edaef385aed6f73292fbe44",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g2v0.json
index 7a73a41bf..b77d2fd95 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g2v0Filler.json",
+            "sourceHash" : "c60b8210e2ddf2fb59e37c6484cc6e6b39c64d536f51545708e39a21a95bd95b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x6195dc8f10829a77aa207e3c294362a19543261a79c77c2185c327bdb8a8ebdc",
+                    "mixHash" : "0xa1ed4cc8768299f6e1eebac463a21ce1bf94beeedd53509d98ea4e6e0e4832e5",
+                    "nonce" : "0xf3978f45b3e4a045",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xae1a82b7c7c163b9183fef3fa91b11763a9a64cd183b4094765aebebd262ec38",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0ae1a82b7c7c163b9183fef3fa91b11763a9a64cd183b4094765aebebd262ec38a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0a1ed4cc8768299f6e1eebac463a21ce1bf94beeedd53509d98ea4e6e0e4832e588f3978f45b3e4a045f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca08267f052cd65e6e81d6839b98fe6d87505aac350d8018f5a23895f701164650ba037c421c870d8b01c12415e26675872e89bcd9dde4c623db53a494dec5df533edc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x8267f052cd65e6e81d6839b98fe6d87505aac350d8018f5a23895f701164650b",
+                        "s" : "0x37c421c870d8b01c12415e26675872e89bcd9dde4c623db53a494dec5df533ed",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6195dc8f10829a77aa207e3c294362a19543261a79c77c2185c327bdb8a8ebdc",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g3v0.json
index 7a73a41bf..8c582493e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g3v0Filler.json",
+            "sourceHash" : "27a6c0ed4fe3899f51d2367460b90c9fe4b44c0b6b3a415df510f50fffb5b2c3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x1ef0ccf9dd32e1a808ba37e594cb92b0dd21b1e0583d904a5d19cfe7b2645d60",
+                    "mixHash" : "0x222afd355429d7df609bc3ea0618bb113fc6218c394feace687aa717de80c7c9",
+                    "nonce" : "0x2c66e7c55cd283ec",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd908138f87a967ade42cef98322e836921ee3d0cc7fe54a952ffef12c3d89db",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0fd908138f87a967ade42cef98322e836921ee3d0cc7fe54a952ffef12c3d89dba0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0222afd355429d7df609bc3ea0618bb113fc6218c394feace687aa717de80c7c9882c66e7c55cd283ecf90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0da55d964eeb5c7bcbfa8c862460997fcf1b953d1501e918f23d21ac95eeff6bda00529106d03cfb1dab7735c9934d747d71f1a38a5ca3eef0a33450d1a9f678cf2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xda55d964eeb5c7bcbfa8c862460997fcf1b953d1501e918f23d21ac95eeff6bd",
+                        "s" : "0x0529106d03cfb1dab7735c9934d747d71f1a38a5ca3eef0a33450d1a9f678cf2",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1ef0ccf9dd32e1a808ba37e594cb92b0dd21b1e0583d904a5d19cfe7b2645d60",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0.json
index 00bc9bec5..03dea276f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_3_100_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0Filler.json",
             "sourceHash" : "5cec1bcf411afc81dd260de12224f4400f0c937edc47237ad12971cc0f98fbc5"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xb012a5f84a5a1b7b7cc2b3d9cf2c0eb176ba5539c5e59e16a76b0a9e39fdb37e",
-                    "mixHash" : "0xdd07ddacda3686850eba1c57be1d7f93b0ab8f5d0a85ea3fdebe61bde3a853ea",
-                    "nonce" : "0x5d73a50f773edace",
+                    "hash" : "0xe7cce32a830801a90bbd5adb34c5f3ecdbf689aaab0e0dc81b5879474e105a33",
+                    "mixHash" : "0x109b5010110ae6bb3124a4e74d18cb3e4359afac081283c6ecde910edcf41ebe",
+                    "nonce" : "0xe9a9e6215167e578",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1da0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0dd07ddacda3686850eba1c57be1d7f93b0ab8f5d0a85ea3fdebe61bde3a853ea885d73a50f773edacef90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca02d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898a0318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1da0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0109b5010110ae6bb3124a4e74d18cb3e4359afac081283c6ecde910edcf41ebe88e9a9e6215167e578f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca02d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898a0318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb012a5f84a5a1b7b7cc2b3d9cf2c0eb176ba5539c5e59e16a76b0a9e39fdb37e",
+        "lastblockhash" : "0xe7cce32a830801a90bbd5adb34c5f3ecdbf689aaab0e0dc81b5879474e105a33",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g1v0.json
index 7a73a41bf..f658fb621 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g1v0Filler.json",
+            "sourceHash" : "3363973747d27aa9e046f487b9af0f3431792a6c55fd33cdd61a4e0dab3b3a44"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x468ad088bab83ee1c2be7769691941ba77cf41d5f71c84362c0b60f0ac2e7cd3",
+                    "mixHash" : "0x2e72134912296d27c0bda382070d04782724c95df041a4a00f85fd3c85882cc7",
+                    "nonce" : "0x275e3370de357ce6",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x52fb41494ffbab8ea9dc4e7de20465cdcec95f75b6e414e78dd36af187a08bad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa052fb41494ffbab8ea9dc4e7de20465cdcec95f75b6e414e78dd36af187a08bada0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a02e72134912296d27c0bda382070d04782724c95df041a4a00f85fd3c85882cc788275e3370de357ce6f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca051c72809f8b6c0c9dd8b06f5a055f8d64b183aae9431a99886a5d6e200e5d41aa0300e70347077b0bdad01a9795f03520d7e27c1cb53029a665af7384aa175116ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x51c72809f8b6c0c9dd8b06f5a055f8d64b183aae9431a99886a5d6e200e5d41a",
+                        "s" : "0x300e70347077b0bdad01a9795f03520d7e27c1cb53029a665af7384aa175116e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x468ad088bab83ee1c2be7769691941ba77cf41d5f71c84362c0b60f0ac2e7cd3",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g2v0.json
index 7a73a41bf..a49e08a49 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g2v0Filler.json",
+            "sourceHash" : "4f88393def8d02759c2f247cd1bc808100027a9e73b83a3fc700094fd0157902"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x5fa2dfd525b6bceeb330e5315db67522fa1a7a0d1efe3fab42f82625c3740d8a",
+                    "mixHash" : "0x4ef0be67ccff466c141d72151c47007277a0b76b2081539e15fee19649a6da1a",
+                    "nonce" : "0x82fd7a5cdcd9c74c",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xae1a82b7c7c163b9183fef3fa91b11763a9a64cd183b4094765aebebd262ec38",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0ae1a82b7c7c163b9183fef3fa91b11763a9a64cd183b4094765aebebd262ec38a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a04ef0be67ccff466c141d72151c47007277a0b76b2081539e15fee19649a6da1a8882fd7a5cdcd9c74cf90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca08267f052cd65e6e81d6839b98fe6d87505aac350d8018f5a23895f701164650ba037c421c870d8b01c12415e26675872e89bcd9dde4c623db53a494dec5df533edc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x8267f052cd65e6e81d6839b98fe6d87505aac350d8018f5a23895f701164650b",
+                        "s" : "0x37c421c870d8b01c12415e26675872e89bcd9dde4c623db53a494dec5df533ed",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5fa2dfd525b6bceeb330e5315db67522fa1a7a0d1efe3fab42f82625c3740d8a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g3v0.json
index 7a73a41bf..65fb0cef4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g3v0Filler.json",
+            "sourceHash" : "3b06968e8c36b3445514b368008778c6cc2a6b0363e2bcf93301c55ae72b5ffd"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xdad20add4b8af39cdfdc9eb76a05504d3407a31a8bc5331a403874fa99056c1a",
+                    "mixHash" : "0xe4b55402deb9886525df5c614539a586df7713f66f0e371b3150ca2ab88ef63c",
+                    "nonce" : "0x814bd2397541dee9",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd908138f87a967ade42cef98322e836921ee3d0cc7fe54a952ffef12c3d89db",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0fd908138f87a967ade42cef98322e836921ee3d0cc7fe54a952ffef12c3d89dba0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0e4b55402deb9886525df5c614539a586df7713f66f0e371b3150ca2ab88ef63c88814bd2397541dee9f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0da55d964eeb5c7bcbfa8c862460997fcf1b953d1501e918f23d21ac95eeff6bda00529106d03cfb1dab7735c9934d747d71f1a38a5ca3eef0a33450d1a9f678cf2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xda55d964eeb5c7bcbfa8c862460997fcf1b953d1501e918f23d21ac95eeff6bd",
+                        "s" : "0x0529106d03cfb1dab7735c9934d747d71f1a38a5ca3eef0a33450d1a9f678cf2",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdad20add4b8af39cdfdc9eb76a05504d3407a31a8bc5331a403874fa99056c1a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0.json
index a0b1a6dd7..2fab57bab 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_3_100_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0Filler.json",
             "sourceHash" : "b8508702d5af3f494a49d1f3f9c0a80bf4710da88cd903c0f3bc9b67173abd9e"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xeb9b361dbc95b168e9e0ef4a1cbf44ae653bf0b47a03aee1829f321eecd3d2fb",
-                    "mixHash" : "0x3008ff12b3d5c45773838cf6390775c0d9544612f63673fd29fb8b73cee39793",
-                    "nonce" : "0x2066be16e350cd5c",
+                    "hash" : "0x54ae552b459c8d3f9e294cbb496211b5d76b1cb52b03995baa2c9b4dc61cd366",
+                    "mixHash" : "0x611976cab7614186308193de17d7ec7a8c05ced7d2d64ab3b2f884b8bd4c38e3",
+                    "nonce" : "0x80454a4235130be0",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x3895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa03895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a03008ff12b3d5c45773838cf6390775c0d9544612f63673fd29fb8b73cee39793882066be16e350cd5cf90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0e29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084a06a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa03895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0611976cab7614186308193de17d7ec7a8c05ced7d2d64ab3b2f884b8bd4c38e38880454a4235130be0f90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0e29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084a06a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeb9b361dbc95b168e9e0ef4a1cbf44ae653bf0b47a03aee1829f321eecd3d2fb",
+        "lastblockhash" : "0x54ae552b459c8d3f9e294cbb496211b5d76b1cb52b03995baa2c9b4dc61cd366",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g1v0.json
index 7a73a41bf..ae72f417e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g1v0Filler.json",
+            "sourceHash" : "e9864644daa8be92c07f9b1db0279c06b996971de6cc67dd72d18de6e77dc841"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x481f8220144bbcbfe790bc2994eb968a93505dc0cc52a1cc1cd03724090a1a32",
+                    "mixHash" : "0xd27d65c500189824199e9c6012730d356ac1d0bf8b9fd9cb28d88935d11b1d2e",
+                    "nonce" : "0x247c869741ec32eb",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x52fb41494ffbab8ea9dc4e7de20465cdcec95f75b6e414e78dd36af187a08bad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa052fb41494ffbab8ea9dc4e7de20465cdcec95f75b6e414e78dd36af187a08bada0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0d27d65c500189824199e9c6012730d356ac1d0bf8b9fd9cb28d88935d11b1d2e88247c869741ec32ebf90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca051c72809f8b6c0c9dd8b06f5a055f8d64b183aae9431a99886a5d6e200e5d41aa0300e70347077b0bdad01a9795f03520d7e27c1cb53029a665af7384aa175116ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x51c72809f8b6c0c9dd8b06f5a055f8d64b183aae9431a99886a5d6e200e5d41a",
+                        "s" : "0x300e70347077b0bdad01a9795f03520d7e27c1cb53029a665af7384aa175116e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x481f8220144bbcbfe790bc2994eb968a93505dc0cc52a1cc1cd03724090a1a32",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g2v0.json
index 7a73a41bf..4944d2120 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g2v0Filler.json",
+            "sourceHash" : "7514c6d52865bdfe9e8002c970e2b90ef25ae0c36a99a545b6f64289000be0d2"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xe776df3581c1a6184998bf24ad2688c5db5c1d4fe13bd11a472bb65853f34972",
+                    "mixHash" : "0x68da0037184ca199562127cb0a4cdd6c3cc89ceff95dc82ecd3c87125a31d7a5",
+                    "nonce" : "0x63a5d7c3c952b6f3",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xae1a82b7c7c163b9183fef3fa91b11763a9a64cd183b4094765aebebd262ec38",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0ae1a82b7c7c163b9183fef3fa91b11763a9a64cd183b4094765aebebd262ec38a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a068da0037184ca199562127cb0a4cdd6c3cc89ceff95dc82ecd3c87125a31d7a58863a5d7c3c952b6f3f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca08267f052cd65e6e81d6839b98fe6d87505aac350d8018f5a23895f701164650ba037c421c870d8b01c12415e26675872e89bcd9dde4c623db53a494dec5df533edc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x8267f052cd65e6e81d6839b98fe6d87505aac350d8018f5a23895f701164650b",
+                        "s" : "0x37c421c870d8b01c12415e26675872e89bcd9dde4c623db53a494dec5df533ed",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe776df3581c1a6184998bf24ad2688c5db5c1d4fe13bd11a472bb65853f34972",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g3v0.json
index 7a73a41bf..765c0bbab 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g3v0Filler.json",
+            "sourceHash" : "01286a188822be064d6ac762038f292432db919590be4c724f3926c60d840fb9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x50bae44d08c15b421cb7f0385dbbfa75b223204480d25f5369e44f8ae58cc14d",
+                    "mixHash" : "0xb50c597d9ddc7bce29c6a0a0fccfe0fa6021f180cb4d5c92a930feb79f295e92",
+                    "nonce" : "0xb844b85037f5e118",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd908138f87a967ade42cef98322e836921ee3d0cc7fe54a952ffef12c3d89db",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0fd908138f87a967ade42cef98322e836921ee3d0cc7fe54a952ffef12c3d89dba0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0b50c597d9ddc7bce29c6a0a0fccfe0fa6021f180cb4d5c92a930feb79f295e9288b844b85037f5e118f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0da55d964eeb5c7bcbfa8c862460997fcf1b953d1501e918f23d21ac95eeff6bda00529106d03cfb1dab7735c9934d747d71f1a38a5ca3eef0a33450d1a9f678cf2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xda55d964eeb5c7bcbfa8c862460997fcf1b953d1501e918f23d21ac95eeff6bd",
+                        "s" : "0x0529106d03cfb1dab7735c9934d747d71f1a38a5ca3eef0a33450d1a9f678cf2",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x50bae44d08c15b421cb7f0385dbbfa75b223204480d25f5369e44f8ae58cc14d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0.json
index 3a4c2bddd..3781b79d6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_0_3_100_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0Filler.json",
             "sourceHash" : "4b58c6149b3bd3457511b11dcfc6e21be391873342f5e02b6198281892f29eb8"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x8d0ef07ff86398183c86fec1309ce30863b4c0d44294ed223b8e08be3ae9e346",
-                    "mixHash" : "0x987aca6fa01a3aab8b4b01ada07cb60238e8551dac9abd34b41c8df556859fd4",
-                    "nonce" : "0x5a1f0e4d84ebac0a",
+                    "hash" : "0xb0367784a016cf490b71ed2f15281415f24ab8728af365b2b96ed46ee8cc4d59",
+                    "mixHash" : "0xfe7be77d011f077bcde3eb9a82dbd115c1f62dd57d55c7df6c87f368e38852bb",
+                    "nonce" : "0xb28588cb9d6c1f42",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xe39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0e39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0987aca6fa01a3aab8b4b01ada07cb60238e8551dac9abd34b41c8df556859fd4885a1f0e4d84ebac0af90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca052eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125a021cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0e39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0fe7be77d011f077bcde3eb9a82dbd115c1f62dd57d55c7df6c87f368e38852bb88b28588cb9d6c1f42f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca052eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125a021cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d0ef07ff86398183c86fec1309ce30863b4c0d44294ed223b8e08be3ae9e346",
+        "lastblockhash" : "0xb0367784a016cf490b71ed2f15281415f24ab8728af365b2b96ed46ee8cc4d59",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g1v0.json
index 7a73a41bf..25e81d431 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g1v0Filler.json",
+            "sourceHash" : "fb5fcea66acc0ed9ecbb2cf6becec64ee75548d6c204318f240b91b9524edb97"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x1857030137b96cbbed717f8b095993a402021131208e353001a3b159bd4a7d5a",
+                    "mixHash" : "0xa8cab8cfb604e8f53fd0573c6cc268eec6d6f6d9048bcd7305ba85f7e5f4e532",
+                    "nonce" : "0x75b8b96be6df0ef0",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x52fb41494ffbab8ea9dc4e7de20465cdcec95f75b6e414e78dd36af187a08bad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa052fb41494ffbab8ea9dc4e7de20465cdcec95f75b6e414e78dd36af187a08bada0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0a8cab8cfb604e8f53fd0573c6cc268eec6d6f6d9048bcd7305ba85f7e5f4e5328875b8b96be6df0ef0f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca051c72809f8b6c0c9dd8b06f5a055f8d64b183aae9431a99886a5d6e200e5d41aa0300e70347077b0bdad01a9795f03520d7e27c1cb53029a665af7384aa175116ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x51c72809f8b6c0c9dd8b06f5a055f8d64b183aae9431a99886a5d6e200e5d41a",
+                        "s" : "0x300e70347077b0bdad01a9795f03520d7e27c1cb53029a665af7384aa175116e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1857030137b96cbbed717f8b095993a402021131208e353001a3b159bd4a7d5a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g2v0.json
index 7a73a41bf..5e45c223b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g2v0Filler.json",
+            "sourceHash" : "159ac954b4daf0be7fc67391808a3d5a04487a39502e80d84b342a71b93d3d65"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x94df92affc292805f033128c9a2becc8e253c13fdc5c1ec24bd91085ff0576a2",
+                    "mixHash" : "0x34ac3b0e0b5f8698306777ad119a5cda96dbc52a0a8cbcdcfd7a1e9c808f5de2",
+                    "nonce" : "0xa34000cce9957ba5",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xae1a82b7c7c163b9183fef3fa91b11763a9a64cd183b4094765aebebd262ec38",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0ae1a82b7c7c163b9183fef3fa91b11763a9a64cd183b4094765aebebd262ec38a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a034ac3b0e0b5f8698306777ad119a5cda96dbc52a0a8cbcdcfd7a1e9c808f5de288a34000cce9957ba5f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca08267f052cd65e6e81d6839b98fe6d87505aac350d8018f5a23895f701164650ba037c421c870d8b01c12415e26675872e89bcd9dde4c623db53a494dec5df533edc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x8267f052cd65e6e81d6839b98fe6d87505aac350d8018f5a23895f701164650b",
+                        "s" : "0x37c421c870d8b01c12415e26675872e89bcd9dde4c623db53a494dec5df533ed",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x94df92affc292805f033128c9a2becc8e253c13fdc5c1ec24bd91085ff0576a2",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g3v0.json
index 7a73a41bf..634f30f82 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_0_3_100_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g3v0Filler.json",
+            "sourceHash" : "852fe950bb2dc137914081b66de1fa6d4f0fe73b9b5a71fc1c8863185968129f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x5b856972d61e3b48053d0d15fa50d5bcc9f7306d67bc076f55dd23e670c0bbe4",
+                    "mixHash" : "0x632eeb4e58da8c205c0ccdf9e68ba45ca332aeb251dd4760a67b89e6cd90ff41",
+                    "nonce" : "0x6a7757515fa8ca1c",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd908138f87a967ade42cef98322e836921ee3d0cc7fe54a952ffef12c3d89db",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0fd908138f87a967ade42cef98322e836921ee3d0cc7fe54a952ffef12c3d89dba0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0632eeb4e58da8c205c0ccdf9e68ba45ca332aeb251dd4760a67b89e6cd90ff41886a7757515fa8ca1cf90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0da55d964eeb5c7bcbfa8c862460997fcf1b953d1501e918f23d21ac95eeff6bda00529106d03cfb1dab7735c9934d747d71f1a38a5ca3eef0a33450d1a9f678cf2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xda55d964eeb5c7bcbfa8c862460997fcf1b953d1501e918f23d21ac95eeff6bd",
+                        "s" : "0x0529106d03cfb1dab7735c9934d747d71f1a38a5ca3eef0a33450d1a9f678cf2",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5b856972d61e3b48053d0d15fa50d5bcc9f7306d67bc076f55dd23e670c0bbe4",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0.json
index 8f724baf1..f319c7c3a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_0_0_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0Filler.json",
             "sourceHash" : "bb9471086140e276ec9b2ad338d8514601f59c7164453c5ba2253751b653071e"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xd6a4a5b2369de523b83fed18b6d41888fc79739e190a46763cf3df7c250a6407",
-                    "mixHash" : "0xfde3bdba583c41de6adf73ac2fec4343a3e5a1cf437fc77d0aceeb1ae84d7617",
-                    "nonce" : "0xef3a003a1e4ef6ef",
+                    "hash" : "0x51917ed966e6aa62d21afcf08cfd16b23b4c2703d350bbd87498dcb0daa65517",
+                    "mixHash" : "0xc112806a90abd7f7ba3ffc4abdd5314fe65fa2093faa56be0fe55cf0ad1093af",
+                    "nonce" : "0x3504fbc89a5a1a03",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x8b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a08b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0fde3bdba583c41de6adf73ac2fec4343a3e5a1cf437fc77d0aceeb1ae84d761788ef3a003a1e4ef6eff90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fea030ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5c0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a08b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0c112806a90abd7f7ba3ffc4abdd5314fe65fa2093faa56be0fe55cf0ad1093af883504fbc89a5a1a03f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fea030ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd6a4a5b2369de523b83fed18b6d41888fc79739e190a46763cf3df7c250a6407",
+        "lastblockhash" : "0x51917ed966e6aa62d21afcf08cfd16b23b4c2703d350bbd87498dcb0daa65517",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g1v0.json
index 7a73a41bf..8b5d97c35 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g1v0Filler.json",
+            "sourceHash" : "21adb8e2402601e3fb5a4438b8579051292f6f4182adb2050d2795418d5652a3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x5c695fbceef176914f49ece51e8ba8cca8c143055818fc9fbe0dc8d997b201b1",
+                    "mixHash" : "0xe1282a920f94cad1207bba59cdc4339326c9ef1fc57495bd6116a7228d1069dc",
+                    "nonce" : "0x158b095a2bf49ef9",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe387c4ae2d89462d5cb8b21ec7535fb2936076f70adb8fd0b53f8699ac1c264c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0e387c4ae2d89462d5cb8b21ec7535fb2936076f70adb8fd0b53f8699ac1c264ca09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0e1282a920f94cad1207bba59cdc4339326c9ef1fc57495bd6116a7228d1069dc88158b095a2bf49ef9f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca02214539c32c7214b9168e5222145db7cd99064ce46063d872aa9f8dcc75d8f9ca063bf940a4350154f34dfd083b62cf5a70095cec1ce1ee36669d8517f1e49d21fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2214539c32c7214b9168e5222145db7cd99064ce46063d872aa9f8dcc75d8f9c",
+                        "s" : "0x63bf940a4350154f34dfd083b62cf5a70095cec1ce1ee36669d8517f1e49d21f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5c695fbceef176914f49ece51e8ba8cca8c143055818fc9fbe0dc8d997b201b1",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g2v0.json
index 7a73a41bf..44545c46d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g2v0Filler.json",
+            "sourceHash" : "df78447e573f3282d4bde30496041997c8eed606c2ee317ef547eee2e3510f9d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xdc121c0bca90a1e3299133be9a951d7fe47f92bfd16aee3a759b71a36f122188",
+                    "mixHash" : "0x50d6487965a45607364d881663076054dbab11aadbb2cbd322fdd89356ef81c7",
+                    "nonce" : "0x9e7c7154be2845a8",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd4afd5939bb6f3d008a0622b8c9e3b26d21759eda84f64ba4c3b39862eb2c8e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0fd4afd5939bb6f3d008a0622b8c9e3b26d21759eda84f64ba4c3b39862eb2c8ea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a050d6487965a45607364d881663076054dbab11aadbb2cbd322fdd89356ef81c7889e7c7154be2845a8f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca01ea70b86d65e1ed1d5b3a0af1e0af052ca88c0cf229568c613f7fb889e904f1ba05524c08dcad27789f8c31c22d07dd1c45de9ae29774a4449a497502a8311203cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x1ea70b86d65e1ed1d5b3a0af1e0af052ca88c0cf229568c613f7fb889e904f1b",
+                        "s" : "0x5524c08dcad27789f8c31c22d07dd1c45de9ae29774a4449a497502a8311203c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdc121c0bca90a1e3299133be9a951d7fe47f92bfd16aee3a759b71a36f122188",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g3v0.json
index 7a73a41bf..946e0ef34 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g3v0Filler.json",
+            "sourceHash" : "e904e0a7ff1c7ef5ce8196ed15cde779efa989b76dbac7e2ba38bc88b33be99e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xdceb8f5949cdc333bf14abb1b67708e80ab59e42bbe1b5fec9da578ed2401b40",
+                    "mixHash" : "0x6363af0f9dc9d3d1e0824089641cb233b762affc2875d99be4574bcbad0fcf2c",
+                    "nonce" : "0x2cf553fce1374bf2",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x281a20e15317ad6cd5c10a0d94f8fdcd8002eadc51fd5b9a217f32ae7ebb6650",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0281a20e15317ad6cd5c10a0d94f8fdcd8002eadc51fd5b9a217f32ae7ebb6650a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a06363af0f9dc9d3d1e0824089641cb233b762affc2875d99be4574bcbad0fcf2c882cf553fce1374bf2f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0d826e556a6bddccf9532d437a0fbf77a385ce4c71a62bb75ec6122475db9c440a021c2b19a5964a858b4a9c546221ef3c0f37773042ca3606aec190bf063301e72c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xd826e556a6bddccf9532d437a0fbf77a385ce4c71a62bb75ec6122475db9c440",
+                        "s" : "0x21c2b19a5964a858b4a9c546221ef3c0f37773042ca3606aec190bf063301e72",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdceb8f5949cdc333bf14abb1b67708e80ab59e42bbe1b5fec9da578ed2401b40",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0.json
index 205fa524c..e40ca62c6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_0_0_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0Filler.json",
             "sourceHash" : "7c1e715cf601e70760438c351cee985a092d4356e6d7f5e7513edad986dd0fa7"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xe297d85b8bd5342df3f4ed8142830fd0c57d68f6b930c0e437861f0db60756f7",
-                    "mixHash" : "0x933217cda95e47457f44cb36ab837c644b0dbf8b05de833a5e062c64584563ed",
-                    "nonce" : "0x7b74e9bcabb1ee0b",
+                    "hash" : "0x05e9ba854480b366419ebe166e1d5f166f4f31f7f00a42e85c50a16c1d35ead8",
+                    "mixHash" : "0x91929d67e79c2f4d54a55589f8927fedf3913bc5872f43cd729906bc8980fad3",
+                    "nonce" : "0x4f0f2e8d1fc06f96",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x54d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3cca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a054d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3ccaa09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0933217cda95e47457f44cb36ab837c644b0dbf8b05de833a5e062c64584563ed887b74e9bcabb1ee0bf90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca059c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040a00ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12fc0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a054d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3ccaa09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a091929d67e79c2f4d54a55589f8927fedf3913bc5872f43cd729906bc8980fad3884f0f2e8d1fc06f96f90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca059c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040a00ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12fc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe297d85b8bd5342df3f4ed8142830fd0c57d68f6b930c0e437861f0db60756f7",
+        "lastblockhash" : "0x05e9ba854480b366419ebe166e1d5f166f4f31f7f00a42e85c50a16c1d35ead8",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g1v0.json
index 7a73a41bf..d043daf15 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g1v0Filler.json",
+            "sourceHash" : "64b0b543440f5c531f1d138da5c6e0d265d4c34f29584766efef7d905078146e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x415a388e85e6f1213817b64500329769e01f33b284ca0fac6beb316d2dc637d7",
+                    "mixHash" : "0x000ca6182a135de6c6a629afdf86f11edb3bca8f4ad3e11766b9da6a25810911",
+                    "nonce" : "0xc949dc2b5d11087b",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe387c4ae2d89462d5cb8b21ec7535fb2936076f70adb8fd0b53f8699ac1c264c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0e387c4ae2d89462d5cb8b21ec7535fb2936076f70adb8fd0b53f8699ac1c264ca09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0000ca6182a135de6c6a629afdf86f11edb3bca8f4ad3e11766b9da6a2581091188c949dc2b5d11087bf90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca02214539c32c7214b9168e5222145db7cd99064ce46063d872aa9f8dcc75d8f9ca063bf940a4350154f34dfd083b62cf5a70095cec1ce1ee36669d8517f1e49d21fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2214539c32c7214b9168e5222145db7cd99064ce46063d872aa9f8dcc75d8f9c",
+                        "s" : "0x63bf940a4350154f34dfd083b62cf5a70095cec1ce1ee36669d8517f1e49d21f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x415a388e85e6f1213817b64500329769e01f33b284ca0fac6beb316d2dc637d7",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g2v0.json
index 7a73a41bf..04422589b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g2v0Filler.json",
+            "sourceHash" : "1a468a148aad219afd01c0013e11ca1ea5ee427e1345c94a6b2ceb2005dc1c51"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x129a1d9309ea0704b8532c73279a1f66a468add647c7b4ffe620513e19fdedeb",
+                    "mixHash" : "0xaf36df1f9aa1fef7c2e3abf4c9ad4aa7be9c570f71bce1cf0d386ab6bf7c3984",
+                    "nonce" : "0x9a4dd5954467a342",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd4afd5939bb6f3d008a0622b8c9e3b26d21759eda84f64ba4c3b39862eb2c8e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0fd4afd5939bb6f3d008a0622b8c9e3b26d21759eda84f64ba4c3b39862eb2c8ea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0af36df1f9aa1fef7c2e3abf4c9ad4aa7be9c570f71bce1cf0d386ab6bf7c3984889a4dd5954467a342f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca01ea70b86d65e1ed1d5b3a0af1e0af052ca88c0cf229568c613f7fb889e904f1ba05524c08dcad27789f8c31c22d07dd1c45de9ae29774a4449a497502a8311203cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x1ea70b86d65e1ed1d5b3a0af1e0af052ca88c0cf229568c613f7fb889e904f1b",
+                        "s" : "0x5524c08dcad27789f8c31c22d07dd1c45de9ae29774a4449a497502a8311203c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x129a1d9309ea0704b8532c73279a1f66a468add647c7b4ffe620513e19fdedeb",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g3v0.json
index 7a73a41bf..0af2dd73b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g3v0Filler.json",
+            "sourceHash" : "f1682c2ba8a17cb084b3d0a27775f1e5294c0c39536c7454bfe491c86d512acc"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x89c34957fea34ffecfaf78673ff6ebed8ef12265b596e1a5bb80f59724aa195e",
+                    "mixHash" : "0xc145d1c45ac0e74cd9bff38b4c59526e8fcfee3909e5ae826528a0bbcca6e63f",
+                    "nonce" : "0x38c0522ea9da5ed0",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x281a20e15317ad6cd5c10a0d94f8fdcd8002eadc51fd5b9a217f32ae7ebb6650",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0281a20e15317ad6cd5c10a0d94f8fdcd8002eadc51fd5b9a217f32ae7ebb6650a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0c145d1c45ac0e74cd9bff38b4c59526e8fcfee3909e5ae826528a0bbcca6e63f8838c0522ea9da5ed0f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0d826e556a6bddccf9532d437a0fbf77a385ce4c71a62bb75ec6122475db9c440a021c2b19a5964a858b4a9c546221ef3c0f37773042ca3606aec190bf063301e72c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xd826e556a6bddccf9532d437a0fbf77a385ce4c71a62bb75ec6122475db9c440",
+                        "s" : "0x21c2b19a5964a858b4a9c546221ef3c0f37773042ca3606aec190bf063301e72",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x89c34957fea34ffecfaf78673ff6ebed8ef12265b596e1a5bb80f59724aa195e",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0.json
index 943fb0bef..3d3f8864c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_0_0_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0Filler.json",
             "sourceHash" : "38c1317a429a31bf9e67165334c37cd90270f894bddf62010718c8c3e4e30074"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa72c",
-                    "hash" : "0xb63eb0729866671c44fb46125392ae2ee0385a89fd32c28a8b55cdb9f08ec36c",
-                    "mixHash" : "0xead4220632a8ea8fe480f23fa6b70d657a88ac6c11d02a99ffb66f47be6e587e",
-                    "nonce" : "0xd62d382d3c1cf0bd",
+                    "hash" : "0x1568467c95e85ab32c7dbabdc41b9274b2f030ab578abdcf655d660431e000bc",
+                    "mixHash" : "0xf5d1572bfcd4cb7062df87ddf1990e0cd6e0e515838c6a9975425f3d255c2963",
+                    "nonce" : "0x5094487b167fd92b",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x55f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xf31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09657cb3862f296d042d3b8286ca6911d7b15b3523cac0eaec91c65d7fb86d4b1a0f31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faaa055f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0ead4220632a8ea8fe480f23fa6b70d657a88ac6c11d02a99ffb66f47be6e587e88d62d382d3c1cf0bdf90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca098ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134a02d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09657cb3862f296d042d3b8286ca6911d7b15b3523cac0eaec91c65d7fb86d4b1a0f31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faaa055f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0f5d1572bfcd4cb7062df87ddf1990e0cd6e0e515838c6a9975425f3d255c2963885094487b167fd92bf90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca098ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134a02d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb63eb0729866671c44fb46125392ae2ee0385a89fd32c28a8b55cdb9f08ec36c",
+        "lastblockhash" : "0x1568467c95e85ab32c7dbabdc41b9274b2f030ab578abdcf655d660431e000bc",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g1v0.json
index 7a73a41bf..7fa4568e7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g1v0Filler.json",
+            "sourceHash" : "89c03c88bc8e4ad7d7a33f7147b025972be481ffb7ff974c24a40945bbbe840c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x5b0f59e0a8ffca1b38fea8ef95c2fd0a3acc995addac3dd293a47fb348847d66",
+                    "mixHash" : "0x2386e46843f5bd9a07567bfe7dd9fd75a907ad2e062847b130d9cf32e22404d6",
+                    "nonce" : "0x8babb97cef801236",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe387c4ae2d89462d5cb8b21ec7535fb2936076f70adb8fd0b53f8699ac1c264c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0e387c4ae2d89462d5cb8b21ec7535fb2936076f70adb8fd0b53f8699ac1c264ca09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a02386e46843f5bd9a07567bfe7dd9fd75a907ad2e062847b130d9cf32e22404d6888babb97cef801236f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca02214539c32c7214b9168e5222145db7cd99064ce46063d872aa9f8dcc75d8f9ca063bf940a4350154f34dfd083b62cf5a70095cec1ce1ee36669d8517f1e49d21fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2214539c32c7214b9168e5222145db7cd99064ce46063d872aa9f8dcc75d8f9c",
+                        "s" : "0x63bf940a4350154f34dfd083b62cf5a70095cec1ce1ee36669d8517f1e49d21f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5b0f59e0a8ffca1b38fea8ef95c2fd0a3acc995addac3dd293a47fb348847d66",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g2v0.json
index 7a73a41bf..41fd10f7d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g2v0Filler.json",
+            "sourceHash" : "c5bb7d3d8f2b62680bba34b75efc8c5003b3d6d01cbf7c624580662e4af856fe"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x5bc4abf6edf1774c41dc6730e3512980045c042bc9f7a735abfb9ad081811b92",
+                    "mixHash" : "0x40bd163635f72d081e088421609eadc374972c1bea6e252e0daf11d3aa002928",
+                    "nonce" : "0x1a529b4f1c2e310c",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd4afd5939bb6f3d008a0622b8c9e3b26d21759eda84f64ba4c3b39862eb2c8e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0fd4afd5939bb6f3d008a0622b8c9e3b26d21759eda84f64ba4c3b39862eb2c8ea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a040bd163635f72d081e088421609eadc374972c1bea6e252e0daf11d3aa002928881a529b4f1c2e310cf90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca01ea70b86d65e1ed1d5b3a0af1e0af052ca88c0cf229568c613f7fb889e904f1ba05524c08dcad27789f8c31c22d07dd1c45de9ae29774a4449a497502a8311203cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x1ea70b86d65e1ed1d5b3a0af1e0af052ca88c0cf229568c613f7fb889e904f1b",
+                        "s" : "0x5524c08dcad27789f8c31c22d07dd1c45de9ae29774a4449a497502a8311203c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5bc4abf6edf1774c41dc6730e3512980045c042bc9f7a735abfb9ad081811b92",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g3v0.json
index 7a73a41bf..8d97e82ef 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g3v0Filler.json",
+            "sourceHash" : "d4300d62be5c8d74359235cece0fa5cccf1f558adfa0b98dd1811170836d1884"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x8e686e53b1930bef3cb5cef712104496f8cdfa117f7424e1825c23e226edd516",
+                    "mixHash" : "0x880623c22f43ce7abb635e3facf021cfff4289e08121d0bd0cd34a95b5ba719d",
+                    "nonce" : "0xcc57236d3b24c6b7",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x281a20e15317ad6cd5c10a0d94f8fdcd8002eadc51fd5b9a217f32ae7ebb6650",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0281a20e15317ad6cd5c10a0d94f8fdcd8002eadc51fd5b9a217f32ae7ebb6650a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0880623c22f43ce7abb635e3facf021cfff4289e08121d0bd0cd34a95b5ba719d88cc57236d3b24c6b7f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0d826e556a6bddccf9532d437a0fbf77a385ce4c71a62bb75ec6122475db9c440a021c2b19a5964a858b4a9c546221ef3c0f37773042ca3606aec190bf063301e72c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xd826e556a6bddccf9532d437a0fbf77a385ce4c71a62bb75ec6122475db9c440",
+                        "s" : "0x21c2b19a5964a858b4a9c546221ef3c0f37773042ca3606aec190bf063301e72",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8e686e53b1930bef3cb5cef712104496f8cdfa117f7424e1825c23e226edd516",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0.json
index 132b78262..b6ee47c03 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_0_0_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0Filler.json",
             "sourceHash" : "b8cbd36ce873c146f435321c1127105c6c18f38c02ed454c84148c26a900c4ef"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x5b704e32a7e3043257f1fe27fa501a143789cca71877aeccdb5a821c43c9ed2c",
-                    "mixHash" : "0x4e802ac0dff29489567449f600ad084f11e680694f0afee70f1df088e9b0da17",
-                    "nonce" : "0x8bfe3e5ddcb145b6",
+                    "hash" : "0x28290270a158d0b094f9e668a1236287938176922522e38263be80ff013050ea",
+                    "mixHash" : "0xe57556d165764460cadb38964b9705958748d664674ff7d0dbdc80a67e11ea19",
+                    "nonce" : "0xbb18cbd12cd1625b",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x0a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a00a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a04e802ac0dff29489567449f600ad084f11e680694f0afee70f1df088e9b0da17888bfe3e5ddcb145b6f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba04ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954a019be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a00a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0e57556d165764460cadb38964b9705958748d664674ff7d0dbdc80a67e11ea1988bb18cbd12cd1625bf90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba04ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954a019be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b704e32a7e3043257f1fe27fa501a143789cca71877aeccdb5a821c43c9ed2c",
+        "lastblockhash" : "0x28290270a158d0b094f9e668a1236287938176922522e38263be80ff013050ea",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g1v0.json
index 7a73a41bf..fd47c10e1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g1v0Filler.json",
+            "sourceHash" : "f9a9a04dbd40f515af9dab9232cc22991f3bd1265241d52545552a17cf6b5f17"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x2c472fd0ad620ef9514ced7052a59bbb48d168ef378530bbcbb3058757f0d288",
+                    "mixHash" : "0x8ca975f82c99719288c86c388db306ec6de3597c8f4186039092066b17afb07b",
+                    "nonce" : "0x14d107fc473ff66e",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe387c4ae2d89462d5cb8b21ec7535fb2936076f70adb8fd0b53f8699ac1c264c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0e387c4ae2d89462d5cb8b21ec7535fb2936076f70adb8fd0b53f8699ac1c264ca09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a08ca975f82c99719288c86c388db306ec6de3597c8f4186039092066b17afb07b8814d107fc473ff66ef90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca02214539c32c7214b9168e5222145db7cd99064ce46063d872aa9f8dcc75d8f9ca063bf940a4350154f34dfd083b62cf5a70095cec1ce1ee36669d8517f1e49d21fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2214539c32c7214b9168e5222145db7cd99064ce46063d872aa9f8dcc75d8f9c",
+                        "s" : "0x63bf940a4350154f34dfd083b62cf5a70095cec1ce1ee36669d8517f1e49d21f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2c472fd0ad620ef9514ced7052a59bbb48d168ef378530bbcbb3058757f0d288",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g2v0.json
index 7a73a41bf..d388404ef 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g2v0Filler.json",
+            "sourceHash" : "91b779581082c2aa3ec610505dd701148194e8d40607099c8d0e270af9b4c4bd"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xe62afaae6ad0792fe542fbb442f319310a2282270d9a86aef9dd57dae91d6ea5",
+                    "mixHash" : "0x18101f41f8968c228c5a600c61be311a00065d5d38ea5038c4feab7cfd938a6b",
+                    "nonce" : "0xaea68a0bfa606312",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd4afd5939bb6f3d008a0622b8c9e3b26d21759eda84f64ba4c3b39862eb2c8e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0fd4afd5939bb6f3d008a0622b8c9e3b26d21759eda84f64ba4c3b39862eb2c8ea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a018101f41f8968c228c5a600c61be311a00065d5d38ea5038c4feab7cfd938a6b88aea68a0bfa606312f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca01ea70b86d65e1ed1d5b3a0af1e0af052ca88c0cf229568c613f7fb889e904f1ba05524c08dcad27789f8c31c22d07dd1c45de9ae29774a4449a497502a8311203cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x1ea70b86d65e1ed1d5b3a0af1e0af052ca88c0cf229568c613f7fb889e904f1b",
+                        "s" : "0x5524c08dcad27789f8c31c22d07dd1c45de9ae29774a4449a497502a8311203c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe62afaae6ad0792fe542fbb442f319310a2282270d9a86aef9dd57dae91d6ea5",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g3v0.json
index 7a73a41bf..9fdaa4001 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g3v0Filler.json",
+            "sourceHash" : "2bd15233e96cc2c8e634d7ecf774a2128e9d4c4ab3cfc138b6d46887af3e0442"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xf0a91b8debeb1aef0c56f6cc1c3852b0d56d2bb00c37fd1b0c37edc13445df02",
+                    "mixHash" : "0x206753755dc6f5aa757d2fe8e4b4807de125d034d6bff0329365c5da5c34d2bc",
+                    "nonce" : "0xceaa987fab9fc71a",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x281a20e15317ad6cd5c10a0d94f8fdcd8002eadc51fd5b9a217f32ae7ebb6650",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0281a20e15317ad6cd5c10a0d94f8fdcd8002eadc51fd5b9a217f32ae7ebb6650a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0206753755dc6f5aa757d2fe8e4b4807de125d034d6bff0329365c5da5c34d2bc88ceaa987fab9fc71af90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0d826e556a6bddccf9532d437a0fbf77a385ce4c71a62bb75ec6122475db9c440a021c2b19a5964a858b4a9c546221ef3c0f37773042ca3606aec190bf063301e72c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xd826e556a6bddccf9532d437a0fbf77a385ce4c71a62bb75ec6122475db9c440",
+                        "s" : "0x21c2b19a5964a858b4a9c546221ef3c0f37773042ca3606aec190bf063301e72",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf0a91b8debeb1aef0c56f6cc1c3852b0d56d2bb00c37fd1b0c37edc13445df02",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0.json
index 2f10fbe85..d53385a9a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_0_0_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0Filler.json",
             "sourceHash" : "157eaac0cf59bf8c22bddf6061b6c49084e118f4eb7d36462aae6a7de249e985"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x4dab7cf260377d92721fde7f5ed8e02bc2b551f92a48e79f4be7c4c3fc004a57",
-                    "mixHash" : "0xa270f9b7bce09bdb1ce83a37dca6f3aaad98a8f79882038bac6324cfe0b11090",
-                    "nonce" : "0x10a2141ce49ecec4",
+                    "hash" : "0x412e7e596dea15bad64df0c2f90e48f6f89c03cb6d707629ab52a2d3f0a4ddc0",
+                    "mixHash" : "0x18ceeec1edac92103682300bf79617debebffd96c37cd73b1d178fb434e31d7d",
+                    "nonce" : "0x4c0012e92d3b5678",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x0fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a00fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0a270f9b7bce09bdb1ce83a37dca6f3aaad98a8f79882038bac6324cfe0b110908810a2141ce49ecec4f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0ee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279a052bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a00fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a018ceeec1edac92103682300bf79617debebffd96c37cd73b1d178fb434e31d7d884c0012e92d3b5678f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0ee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279a052bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4dab7cf260377d92721fde7f5ed8e02bc2b551f92a48e79f4be7c4c3fc004a57",
+        "lastblockhash" : "0x412e7e596dea15bad64df0c2f90e48f6f89c03cb6d707629ab52a2d3f0a4ddc0",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g1v0.json
index 7a73a41bf..5bd71eeee 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g1v0Filler.json",
+            "sourceHash" : "08a28f0532404ca3ddc0f1ff9807ae7cf71e2e5b65c3fdae43a3bc5a1e366f23"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xbe70312246595f078c52c7042e0f97f59cbeddb5ba79173070140368b8413451",
+                    "mixHash" : "0x12f120b713d00146d739c2fe4f259a6b25fc6b8e3d43103818c2377cdf958f04",
+                    "nonce" : "0x14967f4427355073",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe387c4ae2d89462d5cb8b21ec7535fb2936076f70adb8fd0b53f8699ac1c264c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0e387c4ae2d89462d5cb8b21ec7535fb2936076f70adb8fd0b53f8699ac1c264ca09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a012f120b713d00146d739c2fe4f259a6b25fc6b8e3d43103818c2377cdf958f048814967f4427355073f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca02214539c32c7214b9168e5222145db7cd99064ce46063d872aa9f8dcc75d8f9ca063bf940a4350154f34dfd083b62cf5a70095cec1ce1ee36669d8517f1e49d21fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2214539c32c7214b9168e5222145db7cd99064ce46063d872aa9f8dcc75d8f9c",
+                        "s" : "0x63bf940a4350154f34dfd083b62cf5a70095cec1ce1ee36669d8517f1e49d21f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbe70312246595f078c52c7042e0f97f59cbeddb5ba79173070140368b8413451",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g2v0.json
index 7a73a41bf..6c064ddd7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g2v0Filler.json",
+            "sourceHash" : "3fc4b1ce3c8e295ea10917772739271d2042c9fba2fc5a0cd25d668d1d8f8b31"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xbf3687eb3d6aa57d921073f6ecb96e92ad5a19717faed8c022b837802175a571",
+                    "mixHash" : "0xe8c1909350b59dc772ec663a9d3c172a2cac37fa14bb08ae103da501c8792a20",
+                    "nonce" : "0xe5e31d02cace37f1",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd4afd5939bb6f3d008a0622b8c9e3b26d21759eda84f64ba4c3b39862eb2c8e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0fd4afd5939bb6f3d008a0622b8c9e3b26d21759eda84f64ba4c3b39862eb2c8ea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0e8c1909350b59dc772ec663a9d3c172a2cac37fa14bb08ae103da501c8792a2088e5e31d02cace37f1f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca01ea70b86d65e1ed1d5b3a0af1e0af052ca88c0cf229568c613f7fb889e904f1ba05524c08dcad27789f8c31c22d07dd1c45de9ae29774a4449a497502a8311203cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x1ea70b86d65e1ed1d5b3a0af1e0af052ca88c0cf229568c613f7fb889e904f1b",
+                        "s" : "0x5524c08dcad27789f8c31c22d07dd1c45de9ae29774a4449a497502a8311203c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbf3687eb3d6aa57d921073f6ecb96e92ad5a19717faed8c022b837802175a571",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g3v0.json
index 7a73a41bf..76d991eb7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g3v0Filler.json",
+            "sourceHash" : "926081932874793349da2d9fd8c2447dc64de75843eb46828675123f8358847d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x297b325129ae781fc91845e185b9356219e362c787c47c00859192b4809dde0a",
+                    "mixHash" : "0x5c8666a8b91061dcf92321f1554d1736fe1ada6ef5738249527eede954a048d0",
+                    "nonce" : "0x755dc1f0f659a1f8",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x281a20e15317ad6cd5c10a0d94f8fdcd8002eadc51fd5b9a217f32ae7ebb6650",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0281a20e15317ad6cd5c10a0d94f8fdcd8002eadc51fd5b9a217f32ae7ebb6650a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a05c8666a8b91061dcf92321f1554d1736fe1ada6ef5738249527eede954a048d088755dc1f0f659a1f8f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0d826e556a6bddccf9532d437a0fbf77a385ce4c71a62bb75ec6122475db9c440a021c2b19a5964a858b4a9c546221ef3c0f37773042ca3606aec190bf063301e72c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xd826e556a6bddccf9532d437a0fbf77a385ce4c71a62bb75ec6122475db9c440",
+                        "s" : "0x21c2b19a5964a858b4a9c546221ef3c0f37773042ca3606aec190bf063301e72",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x297b325129ae781fc91845e185b9356219e362c787c47c00859192b4809dde0a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0.json
index a4be4dcf1..5868bc219 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_0_0_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0Filler.json",
             "sourceHash" : "956429ee2a44b01ff3630ee101ea1cfbe625a23e0940dd74eb8cefcf2270bdc2"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x2529296fad15bd082dccba7535569f6166c5d3fc270bdb248225b17a1aa9d11d",
-                    "mixHash" : "0xe5e8eaa3a3c1aa794d403207b305e75e9611cf51937eba821784daba61cb3c9c",
-                    "nonce" : "0x2554058224212baa",
+                    "hash" : "0xf367250a9e6f7da745f2b4e6aa8357c38f9fcec350cd5c10f8463d19d1f44730",
+                    "mixHash" : "0xc752228b5a5d20615f85569f137f70f9e435ad446dc73d7bf96bce566646fd26",
+                    "nonce" : "0xcfd9723ff9554491",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x0e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a00e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0e5e8eaa3a3c1aa794d403207b305e75e9611cf51937eba821784daba61cb3c9c882554058224212baaf90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0bf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34a01bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a00e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0c752228b5a5d20615f85569f137f70f9e435ad446dc73d7bf96bce566646fd2688cfd9723ff9554491f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0bf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34a01bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2529296fad15bd082dccba7535569f6166c5d3fc270bdb248225b17a1aa9d11d",
+        "lastblockhash" : "0xf367250a9e6f7da745f2b4e6aa8357c38f9fcec350cd5c10f8463d19d1f44730",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g1v0.json
index 7a73a41bf..be51d43e5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g1v0Filler.json",
+            "sourceHash" : "ffd4900213a19823ecf7346070ab5c66f51ef29a8cbda1e366dc2ac5f96268db"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xa2664bbf240d62e6e1b05c0540425d17c11c99565fcad9e80e13cba188f40274",
+                    "mixHash" : "0x65d3997d794d67901620977e0273c5357d635b5c03e7fc00c5046cad39eb3efc",
+                    "nonce" : "0xa2e18105b897369d",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe387c4ae2d89462d5cb8b21ec7535fb2936076f70adb8fd0b53f8699ac1c264c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0e387c4ae2d89462d5cb8b21ec7535fb2936076f70adb8fd0b53f8699ac1c264ca09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a065d3997d794d67901620977e0273c5357d635b5c03e7fc00c5046cad39eb3efc88a2e18105b897369df90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca02214539c32c7214b9168e5222145db7cd99064ce46063d872aa9f8dcc75d8f9ca063bf940a4350154f34dfd083b62cf5a70095cec1ce1ee36669d8517f1e49d21fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2214539c32c7214b9168e5222145db7cd99064ce46063d872aa9f8dcc75d8f9c",
+                        "s" : "0x63bf940a4350154f34dfd083b62cf5a70095cec1ce1ee36669d8517f1e49d21f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa2664bbf240d62e6e1b05c0540425d17c11c99565fcad9e80e13cba188f40274",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g2v0.json
index 7a73a41bf..1aa4780ec 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g2v0Filler.json",
+            "sourceHash" : "3aae53a21f9c79ad6811001688ed6f5c577e6af2dd2cd81b425f11e6afeec2d2"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x2c6afdb683f5fa7c09df72af74aaea10e3d26f2896e56505b8880c09b992a831",
+                    "mixHash" : "0xba0cc6ebf645fd5e49ab8b9574b2cce2c1190582bf482416966c4a413a9b1220",
+                    "nonce" : "0xeb1a4897acf0ae93",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd4afd5939bb6f3d008a0622b8c9e3b26d21759eda84f64ba4c3b39862eb2c8e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0fd4afd5939bb6f3d008a0622b8c9e3b26d21759eda84f64ba4c3b39862eb2c8ea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0ba0cc6ebf645fd5e49ab8b9574b2cce2c1190582bf482416966c4a413a9b122088eb1a4897acf0ae93f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca01ea70b86d65e1ed1d5b3a0af1e0af052ca88c0cf229568c613f7fb889e904f1ba05524c08dcad27789f8c31c22d07dd1c45de9ae29774a4449a497502a8311203cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x1ea70b86d65e1ed1d5b3a0af1e0af052ca88c0cf229568c613f7fb889e904f1b",
+                        "s" : "0x5524c08dcad27789f8c31c22d07dd1c45de9ae29774a4449a497502a8311203c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2c6afdb683f5fa7c09df72af74aaea10e3d26f2896e56505b8880c09b992a831",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g3v0.json
index 7a73a41bf..32891c0f0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_0_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g3v0Filler.json",
+            "sourceHash" : "ada557ebb3e8a3ac3c782fa73a44d1f2ca03d4df87c4da9b43d8791fcae89a4e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x88fe765f33809d61858469866e07fcccb93ecbf66511f4de9b1b78debc28dea9",
+                    "mixHash" : "0x4f0bf9d811cbe5ed50478ff6ffa0025e97e0aed4260361edfd6fc21cb706b8c6",
+                    "nonce" : "0x7129bd0e765c6090",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0xc79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x281a20e15317ad6cd5c10a0d94f8fdcd8002eadc51fd5b9a217f32ae7ebb6650",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c79b1db37b1bd55a8a16e71e94de9e8ffb9559e105a00a40070c3287c1acc027a0281a20e15317ad6cd5c10a0d94f8fdcd8002eadc51fd5b9a217f32ae7ebb6650a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a04f0bf9d811cbe5ed50478ff6ffa0025e97e0aed4260361edfd6fc21cb706b8c6887129bd0e765c6090f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0d826e556a6bddccf9532d437a0fbf77a385ce4c71a62bb75ec6122475db9c440a021c2b19a5964a858b4a9c546221ef3c0f37773042ca3606aec190bf063301e72c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xd826e556a6bddccf9532d437a0fbf77a385ce4c71a62bb75ec6122475db9c440",
+                        "s" : "0x21c2b19a5964a858b4a9c546221ef3c0f37773042ca3606aec190bf063301e72",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x88fe765f33809d61858469866e07fcccb93ecbf66511f4de9b1b78debc28dea9",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0.json
index d3b0873d1..e21eae6ee 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_0_1_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0Filler.json",
             "sourceHash" : "e6695d68d69d7f053ee9a857b0ba5b147d3e4fa194e26fb077e3f68efa93b32c"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xc26c95a4f7213dc6762eb127cdc046ca53799924b127100a6c2855e94be98e80",
-                    "mixHash" : "0x2ca13f21a584a6c81c9885adc3d22ac5e69f45e0a3c5ce440b6204802c45e0c3",
-                    "nonce" : "0xc26fbd84e133b39a",
+                    "hash" : "0x8ba947cd5cd95a08f51f1981c09244289ede39eeb76e222fe8c10985652f84ff",
+                    "mixHash" : "0xef22c61ecb15ee534403ea73b79455e2a5ff31c7fd6c2bedc9b5a9b87b50c0fd",
+                    "nonce" : "0x4cdb1603e1cacc74",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xb4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0b4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a02ca13f21a584a6c81c9885adc3d22ac5e69f45e0a3c5ce440b6204802c45e0c388c26fbd84e133b39af90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca02e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4a020f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459dc0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0b4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0ef22c61ecb15ee534403ea73b79455e2a5ff31c7fd6c2bedc9b5a9b87b50c0fd884cdb1603e1cacc74f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca02e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4a020f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc26c95a4f7213dc6762eb127cdc046ca53799924b127100a6c2855e94be98e80",
+        "lastblockhash" : "0x8ba947cd5cd95a08f51f1981c09244289ede39eeb76e222fe8c10985652f84ff",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g1v0.json
index 7a73a41bf..e46442b0f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g1v0Filler.json",
+            "sourceHash" : "9cccc5136428ed29e2e42356629647db3ea5f526142ad4871b4cd478af538ebf"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x03c302bdc51c65b8ec7195dd21a74fdbb45b640c9e8de26339fee3e83b9bf6c2",
+                    "mixHash" : "0xcfffaab4761b8f64707effc00e108206bc14d1297aed3f3612984794100f57ce",
+                    "nonce" : "0x5bb1d293bbd5aced",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4e94e222af2d7c9286d4f4d40ae85394b356ea772ceed6415513a9b35f593a0f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa04e94e222af2d7c9286d4f4d40ae85394b356ea772ceed6415513a9b35f593a0fa0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0cfffaab4761b8f64707effc00e108206bc14d1297aed3f3612984794100f57ce885bb1d293bbd5acedf90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0f894511d307f1ecdcf5430824a297de9551a7079db22b81949239992caf95275a010cdb30865fad84176b4610c14718a4a06afa638324d6ae173b143496af48108c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xf894511d307f1ecdcf5430824a297de9551a7079db22b81949239992caf95275",
+                        "s" : "0x10cdb30865fad84176b4610c14718a4a06afa638324d6ae173b143496af48108",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x03c302bdc51c65b8ec7195dd21a74fdbb45b640c9e8de26339fee3e83b9bf6c2",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g2v0.json
index 7a73a41bf..4c18b434f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g2v0Filler.json",
+            "sourceHash" : "9103ac2473ad4fb3d4e358e6e25b23c01dbb7fa11ee027c68a272205d7bd3726"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x1a3584f07677b7bcbf9848edc303359c1d8403ed40b3ea39a3c4dfef11df4ce6",
+                    "mixHash" : "0x342680ad8aaf4a099ddd83ef8b14b355ce64afcee3f8eba4974754e8707045e0",
+                    "nonce" : "0x361c8e7d447a8f9c",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x12c0fd03a90fc97f9487c472139dc3f88102646d72cdfdb6ccc9c48e8e14d908",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa012c0fd03a90fc97f9487c472139dc3f88102646d72cdfdb6ccc9c48e8e14d908a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0342680ad8aaf4a099ddd83ef8b14b355ce64afcee3f8eba4974754e8707045e088361c8e7d447a8f9cf90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0c3cd6910f36ea8a45f5e7f861759b3052a69965b37289b1185ba38c3eb568363a01965c2a36ab119ea229691b95382be03e514c022f9cfa09c2e1dd23978c084c5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc3cd6910f36ea8a45f5e7f861759b3052a69965b37289b1185ba38c3eb568363",
+                        "s" : "0x1965c2a36ab119ea229691b95382be03e514c022f9cfa09c2e1dd23978c084c5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1a3584f07677b7bcbf9848edc303359c1d8403ed40b3ea39a3c4dfef11df4ce6",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g3v0.json
index 7a73a41bf..5b691b9e9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g3v0Filler.json",
+            "sourceHash" : "3846b436b75c57a612303bb6d72c69f4a029c38175bf088df8a8b8fd1cac1106"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xe3be8ba080bc202df363d20eac0a1df5966effff3085784aad57b231b7d66e15",
+                    "mixHash" : "0x1680cbab4e02e7850eed6b1526054761f7b260f799588ffeaad93eeb9fb669aa",
+                    "nonce" : "0xa556758c88338f89",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x80499d87a9f81104a1d7269e7033fbf554ffdef6cd9f2576841a0788d44b86d2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa080499d87a9f81104a1d7269e7033fbf554ffdef6cd9f2576841a0788d44b86d2a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a01680cbab4e02e7850eed6b1526054761f7b260f799588ffeaad93eeb9fb669aa88a556758c88338f89f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0263867e9527162126c30750aa8078703f32e1f5b0a5bc74e6348287879a003e3a01d47c1a5b0d2d1be39d77dc6820504031111da194954304e39e6bc75435b1c1fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x263867e9527162126c30750aa8078703f32e1f5b0a5bc74e6348287879a003e3",
+                        "s" : "0x1d47c1a5b0d2d1be39d77dc6820504031111da194954304e39e6bc75435b1c1f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe3be8ba080bc202df363d20eac0a1df5966effff3085784aad57b231b7d66e15",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0.json
index 88553356a..be2a4e852 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_0_1_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0Filler.json",
             "sourceHash" : "bfc687854be596f3d1becdba4558627e9cb82e0b311f972843a16172f5566b62"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xc54260a883c8fa7f610f703c65ec12561c47a5db1c00d6ce2df00128c0b59b8f",
-                    "mixHash" : "0x2d6a9c2ce705b91124800b853f3a9ef4e336b83c9a267c3d48b2d3eb5cddbaf9",
-                    "nonce" : "0x95de8d86d2082671",
+                    "hash" : "0xb8761dac67c34ef9ad401587e3ebf52907664028135edc7f8a1e6e681f986098",
+                    "mixHash" : "0x2c220cb67fa93ae33964800ae9734fe92354aadb225a68eb189cd9d94c4d0f0d",
+                    "nonce" : "0xe10e1c41de7f80d5",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x93f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa093f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a02d6a9c2ce705b91124800b853f3a9ef4e336b83c9a267c3d48b2d3eb5cddbaf98895de8d86d2082671f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba05c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5a06fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624c0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa093f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a02c220cb67fa93ae33964800ae9734fe92354aadb225a68eb189cd9d94c4d0f0d88e10e1c41de7f80d5f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba05c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5a06fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc54260a883c8fa7f610f703c65ec12561c47a5db1c00d6ce2df00128c0b59b8f",
+        "lastblockhash" : "0xb8761dac67c34ef9ad401587e3ebf52907664028135edc7f8a1e6e681f986098",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g1v0.json
index 7a73a41bf..9ff20ba47 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g1v0Filler.json",
+            "sourceHash" : "7eab8d8980bf3cf435a2726037288a6dbb254687f463d052ba757b9c2a2411d6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x47c9b1a49c02eb99fc8f851268f0960131134c097300f1a2b30fd1b9ae00b8be",
+                    "mixHash" : "0xb2389d9f6bbf7530a85bd6ef537890d8a5aa93096238468043301baf87c6da18",
+                    "nonce" : "0x709714e1a5304b09",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4e94e222af2d7c9286d4f4d40ae85394b356ea772ceed6415513a9b35f593a0f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa04e94e222af2d7c9286d4f4d40ae85394b356ea772ceed6415513a9b35f593a0fa0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0b2389d9f6bbf7530a85bd6ef537890d8a5aa93096238468043301baf87c6da1888709714e1a5304b09f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0f894511d307f1ecdcf5430824a297de9551a7079db22b81949239992caf95275a010cdb30865fad84176b4610c14718a4a06afa638324d6ae173b143496af48108c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xf894511d307f1ecdcf5430824a297de9551a7079db22b81949239992caf95275",
+                        "s" : "0x10cdb30865fad84176b4610c14718a4a06afa638324d6ae173b143496af48108",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x47c9b1a49c02eb99fc8f851268f0960131134c097300f1a2b30fd1b9ae00b8be",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g2v0.json
index 7a73a41bf..2a534eb22 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g2v0Filler.json",
+            "sourceHash" : "dc89f22925817e6e59677609b2084f6e4b2af090f14b9b789baa028e602bb4b3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xb96374f1518cbfe3658ca7e59aa9dbdc8d8769523291b4cff0eed7781d86725b",
+                    "mixHash" : "0x1c07b1d6fc3b553fc60b6bf06ab2b498e5752f679e548820b4adbda83a7c1598",
+                    "nonce" : "0xf8d5b3beabed2532",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x12c0fd03a90fc97f9487c472139dc3f88102646d72cdfdb6ccc9c48e8e14d908",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa012c0fd03a90fc97f9487c472139dc3f88102646d72cdfdb6ccc9c48e8e14d908a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a01c07b1d6fc3b553fc60b6bf06ab2b498e5752f679e548820b4adbda83a7c159888f8d5b3beabed2532f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0c3cd6910f36ea8a45f5e7f861759b3052a69965b37289b1185ba38c3eb568363a01965c2a36ab119ea229691b95382be03e514c022f9cfa09c2e1dd23978c084c5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc3cd6910f36ea8a45f5e7f861759b3052a69965b37289b1185ba38c3eb568363",
+                        "s" : "0x1965c2a36ab119ea229691b95382be03e514c022f9cfa09c2e1dd23978c084c5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb96374f1518cbfe3658ca7e59aa9dbdc8d8769523291b4cff0eed7781d86725b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g3v0.json
index 7a73a41bf..8ea09fcca 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g3v0Filler.json",
+            "sourceHash" : "17408f97c6363d36b53678162ff62ad3353582ed448a5ffddf7a62e2d2bf0ac6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xcb51f522b8ab64839fc1ccb9923443541d8c1973ef1af484543ed866042815cf",
+                    "mixHash" : "0x831c447f452081b38f5ac69c3d31a6d3c23b86d63cbbd5e70bd107ab68052697",
+                    "nonce" : "0xc89edd8570ec6687",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x80499d87a9f81104a1d7269e7033fbf554ffdef6cd9f2576841a0788d44b86d2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa080499d87a9f81104a1d7269e7033fbf554ffdef6cd9f2576841a0788d44b86d2a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0831c447f452081b38f5ac69c3d31a6d3c23b86d63cbbd5e70bd107ab6805269788c89edd8570ec6687f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0263867e9527162126c30750aa8078703f32e1f5b0a5bc74e6348287879a003e3a01d47c1a5b0d2d1be39d77dc6820504031111da194954304e39e6bc75435b1c1fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x263867e9527162126c30750aa8078703f32e1f5b0a5bc74e6348287879a003e3",
+                        "s" : "0x1d47c1a5b0d2d1be39d77dc6820504031111da194954304e39e6bc75435b1c1f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcb51f522b8ab64839fc1ccb9923443541d8c1973ef1af484543ed866042815cf",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0.json
index a28df4553..4546ffc2b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_0_1_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0Filler.json",
             "sourceHash" : "2c471faf2f696e2eda935130cdf427bab9c51f4ab48f921394421fd4bd6ab549"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7ac",
-                    "hash" : "0xd72faee803c09c73048c054d23e08b30d06971a26f05b29ed151bb9642eca09c",
-                    "mixHash" : "0x8931e2907f70fcfd09c71085f0221642be68d13027a56c332e785a3e7015ff24",
-                    "nonce" : "0xbd173af122d92371",
+                    "hash" : "0xb6a3f6c0a5a03b4cbd9efb2f878553f4c24521d7a129a13a985bd14d328e3573",
+                    "mixHash" : "0x0df9cf287e3481315a62e302e43fa4fc1c6993198daad68adcd13de1af377a03",
+                    "nonce" : "0xb7aabe8726e06c81",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x6f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271db",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x96d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0504d51782c0ac6c9f4146fceac1a238df050ab83ece4749430e4f23222a25710a096d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74a06f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271dbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a08931e2907f70fcfd09c71085f0221642be68d13027a56c332e785a3e7015ff2488bd173af122d92371f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba01fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91a05d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42ccc0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0504d51782c0ac6c9f4146fceac1a238df050ab83ece4749430e4f23222a25710a096d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74a06f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271dbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a00df9cf287e3481315a62e302e43fa4fc1c6993198daad68adcd13de1af377a0388b7aabe8726e06c81f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba01fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91a05d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42ccc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd72faee803c09c73048c054d23e08b30d06971a26f05b29ed151bb9642eca09c",
+        "lastblockhash" : "0xb6a3f6c0a5a03b4cbd9efb2f878553f4c24521d7a129a13a985bd14d328e3573",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g1v0.json
index 7a73a41bf..71fbb73cf 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g1v0Filler.json",
+            "sourceHash" : "f762e87d6fe4ac082812fdf4d38b95d7eba45133c08a728aa12b3e6d4737d78a"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xc8205b4cd521f3f1e31f40fbff6fa760a313aa092f9feb37258d4286f9da7d24",
+                    "mixHash" : "0xc89ac14d3c6f3758429af1b4c7f32322e628f7d5ee16758050c69fc72b60e168",
+                    "nonce" : "0x41e3fad314b9ee8e",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4e94e222af2d7c9286d4f4d40ae85394b356ea772ceed6415513a9b35f593a0f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa04e94e222af2d7c9286d4f4d40ae85394b356ea772ceed6415513a9b35f593a0fa0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0c89ac14d3c6f3758429af1b4c7f32322e628f7d5ee16758050c69fc72b60e1688841e3fad314b9ee8ef90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0f894511d307f1ecdcf5430824a297de9551a7079db22b81949239992caf95275a010cdb30865fad84176b4610c14718a4a06afa638324d6ae173b143496af48108c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xf894511d307f1ecdcf5430824a297de9551a7079db22b81949239992caf95275",
+                        "s" : "0x10cdb30865fad84176b4610c14718a4a06afa638324d6ae173b143496af48108",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc8205b4cd521f3f1e31f40fbff6fa760a313aa092f9feb37258d4286f9da7d24",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g2v0.json
index 7a73a41bf..68aa1242d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g2v0Filler.json",
+            "sourceHash" : "70b4f5d83afa9ee10f2a7cfbc7608994e39f382c6fe084097b6652ae889c0723"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xa7703c0a856a3a6a1f05c88cc2a30a3bb5cfa505cda64f4abbefc7d980448d58",
+                    "mixHash" : "0x86fad034276fdefe73449fe67a6193c3bbe906c3ef6e9fe4dfa8c936acb522b0",
+                    "nonce" : "0xe2cd63928e91f94b",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x12c0fd03a90fc97f9487c472139dc3f88102646d72cdfdb6ccc9c48e8e14d908",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa012c0fd03a90fc97f9487c472139dc3f88102646d72cdfdb6ccc9c48e8e14d908a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a086fad034276fdefe73449fe67a6193c3bbe906c3ef6e9fe4dfa8c936acb522b088e2cd63928e91f94bf90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0c3cd6910f36ea8a45f5e7f861759b3052a69965b37289b1185ba38c3eb568363a01965c2a36ab119ea229691b95382be03e514c022f9cfa09c2e1dd23978c084c5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc3cd6910f36ea8a45f5e7f861759b3052a69965b37289b1185ba38c3eb568363",
+                        "s" : "0x1965c2a36ab119ea229691b95382be03e514c022f9cfa09c2e1dd23978c084c5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa7703c0a856a3a6a1f05c88cc2a30a3bb5cfa505cda64f4abbefc7d980448d58",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g3v0.json
index 7a73a41bf..ab4308fea 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g3v0Filler.json",
+            "sourceHash" : "55cd9d5c50ccac3949e2e0f14865dd5352231582847c791bf39194837307b4b5"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x472abc5b10e0677955d9e9d2a97083001e0c39f4d7d8f2b07a47a23f04456158",
+                    "mixHash" : "0x93253257ddbb9af0dde54370bd8b21151a3db9fd274ad6ba05d098fb2869cf2d",
+                    "nonce" : "0xcf517a13cfe7571a",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x80499d87a9f81104a1d7269e7033fbf554ffdef6cd9f2576841a0788d44b86d2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa080499d87a9f81104a1d7269e7033fbf554ffdef6cd9f2576841a0788d44b86d2a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a093253257ddbb9af0dde54370bd8b21151a3db9fd274ad6ba05d098fb2869cf2d88cf517a13cfe7571af90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0263867e9527162126c30750aa8078703f32e1f5b0a5bc74e6348287879a003e3a01d47c1a5b0d2d1be39d77dc6820504031111da194954304e39e6bc75435b1c1fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x263867e9527162126c30750aa8078703f32e1f5b0a5bc74e6348287879a003e3",
+                        "s" : "0x1d47c1a5b0d2d1be39d77dc6820504031111da194954304e39e6bc75435b1c1f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x472abc5b10e0677955d9e9d2a97083001e0c39f4d7d8f2b07a47a23f04456158",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0.json
index 4b68f85a8..737a7544d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_0_1_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0Filler.json",
             "sourceHash" : "9afac08fdca56804e96bda610efe4fb3ab89558506b40bc51f7850249d990806"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x6022b82ab4f9dd3acd2e9c5ab4154a73f5b71986ea17dcd23d53aff4e21ebc3b",
-                    "mixHash" : "0xb0e5c2420465d09771ce99bd77eee6b4c40bcd18582ec51a4a277b4954b24f1b",
-                    "nonce" : "0xaa2a146abfd96766",
+                    "hash" : "0xea7087d8858f9520156d656645d2253d807d1f6e1ed990725c98cc7c7fd9e9f9",
+                    "mixHash" : "0x609f1b5b673545d1cdb18ea2ab3925aa4d85ab56993feb03856f07e73d1a9527",
+                    "nonce" : "0x981a8689e20bb3de",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x06f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa006f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0b0e5c2420465d09771ce99bd77eee6b4c40bcd18582ec51a4a277b4954b24f1b88aa2a146abfd96766f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4a0168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74ac0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa006f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0609f1b5b673545d1cdb18ea2ab3925aa4d85ab56993feb03856f07e73d1a952788981a8689e20bb3def90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4a0168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6022b82ab4f9dd3acd2e9c5ab4154a73f5b71986ea17dcd23d53aff4e21ebc3b",
+        "lastblockhash" : "0xea7087d8858f9520156d656645d2253d807d1f6e1ed990725c98cc7c7fd9e9f9",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g1v0.json
index 7a73a41bf..a4c01aa86 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g1v0Filler.json",
+            "sourceHash" : "be12dd1c064779d973564acedf90e74e8fb74ff257678d01314e0be1849a8b26"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x18ed2ae281b6fd233936d65fdb6e820fefecafbb59b9e1a1a47c598cff99d2a3",
+                    "mixHash" : "0xeb253c12f84e969d5d52a72ac88e5c268a778f9d020e4675872898d01a029b9b",
+                    "nonce" : "0x60e1b8603e9b3654",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4e94e222af2d7c9286d4f4d40ae85394b356ea772ceed6415513a9b35f593a0f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa04e94e222af2d7c9286d4f4d40ae85394b356ea772ceed6415513a9b35f593a0fa0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0eb253c12f84e969d5d52a72ac88e5c268a778f9d020e4675872898d01a029b9b8860e1b8603e9b3654f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0f894511d307f1ecdcf5430824a297de9551a7079db22b81949239992caf95275a010cdb30865fad84176b4610c14718a4a06afa638324d6ae173b143496af48108c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xf894511d307f1ecdcf5430824a297de9551a7079db22b81949239992caf95275",
+                        "s" : "0x10cdb30865fad84176b4610c14718a4a06afa638324d6ae173b143496af48108",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x18ed2ae281b6fd233936d65fdb6e820fefecafbb59b9e1a1a47c598cff99d2a3",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g2v0.json
index 7a73a41bf..4e3542605 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g2v0Filler.json",
+            "sourceHash" : "32b8e4dc81dea6588a21c5b436c45eb03f4829b658a06d876922b3dd0ba4f43d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xc41d919bf3067af41deee2b9929c3cbc6dddf0adda65c20c8b6a7f43032e3457",
+                    "mixHash" : "0x215cb5bb0eca2c99bde600d551267f513ea2a1057b7321eb6a4a3294454b74d7",
+                    "nonce" : "0x024bd05d8dcf2551",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x12c0fd03a90fc97f9487c472139dc3f88102646d72cdfdb6ccc9c48e8e14d908",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa012c0fd03a90fc97f9487c472139dc3f88102646d72cdfdb6ccc9c48e8e14d908a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0215cb5bb0eca2c99bde600d551267f513ea2a1057b7321eb6a4a3294454b74d788024bd05d8dcf2551f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0c3cd6910f36ea8a45f5e7f861759b3052a69965b37289b1185ba38c3eb568363a01965c2a36ab119ea229691b95382be03e514c022f9cfa09c2e1dd23978c084c5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc3cd6910f36ea8a45f5e7f861759b3052a69965b37289b1185ba38c3eb568363",
+                        "s" : "0x1965c2a36ab119ea229691b95382be03e514c022f9cfa09c2e1dd23978c084c5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc41d919bf3067af41deee2b9929c3cbc6dddf0adda65c20c8b6a7f43032e3457",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g3v0.json
index 7a73a41bf..242a2fbfc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g3v0Filler.json",
+            "sourceHash" : "d5c7be5bbdce2d18dfb172799edb5f5b1d95054b59cf549756ad1b268e25628e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x166527667c6d6d12ae7ca3fdf11fa35419e9a4aeef85ab80c00ae0b8f8247f07",
+                    "mixHash" : "0x8cbba27fb41f1bde1ad5eb6e820b81fdc4aa9a62f9cf33eb6462ded294790b9b",
+                    "nonce" : "0xff977e0d211bf650",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x80499d87a9f81104a1d7269e7033fbf554ffdef6cd9f2576841a0788d44b86d2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa080499d87a9f81104a1d7269e7033fbf554ffdef6cd9f2576841a0788d44b86d2a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a08cbba27fb41f1bde1ad5eb6e820b81fdc4aa9a62f9cf33eb6462ded294790b9b88ff977e0d211bf650f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0263867e9527162126c30750aa8078703f32e1f5b0a5bc74e6348287879a003e3a01d47c1a5b0d2d1be39d77dc6820504031111da194954304e39e6bc75435b1c1fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x263867e9527162126c30750aa8078703f32e1f5b0a5bc74e6348287879a003e3",
+                        "s" : "0x1d47c1a5b0d2d1be39d77dc6820504031111da194954304e39e6bc75435b1c1f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x166527667c6d6d12ae7ca3fdf11fa35419e9a4aeef85ab80c00ae0b8f8247f07",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0.json
index 6c01d682f..d8c7bcfd7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_0_1_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0Filler.json",
             "sourceHash" : "ae2f4352211df012ba244d11d99b5926ec218f39aea1ca40a6226bc0e2560d49"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x1dea2358219eb5c435111ff45d8b4121522ffbcd628f39d8ec8128fc37c87993",
-                    "mixHash" : "0xc02b54c1b9a3c8e6b2102ac48bf2e6394a7250f2b26fc782eac6a7a6f10242dd",
-                    "nonce" : "0xafb3e4d1741c5b55",
+                    "hash" : "0x39d38113f9befdea02c5f1d63b177e07f993eed94a30a32cf1f9e781f6aa6bad",
+                    "mixHash" : "0x364dd76df737734e6bff9013f09e51bd65522a24717069f978017efd6c44d1cc",
+                    "nonce" : "0x736f2030db1a936c",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xdbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0dbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0c02b54c1b9a3c8e6b2102ac48bf2e6394a7250f2b26fc782eac6a7a6f10242dd88afb3e4d1741c5b55f90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba089e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846aa01004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa0dbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0364dd76df737734e6bff9013f09e51bd65522a24717069f978017efd6c44d1cc88736f2030db1a936cf90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba089e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846aa01004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1dea2358219eb5c435111ff45d8b4121522ffbcd628f39d8ec8128fc37c87993",
+        "lastblockhash" : "0x39d38113f9befdea02c5f1d63b177e07f993eed94a30a32cf1f9e781f6aa6bad",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g1v0.json
index 7a73a41bf..4bf5a18c6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g1v0Filler.json",
+            "sourceHash" : "0e8d0b7e6c76839efdbddb18338da9c13ab7576eb67d2cf6c51479e746a2c60f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xf47de5cb76663c1aadcc775d0fdd7d84f79af149b19f3d8b975fe6836a309568",
+                    "mixHash" : "0x7bb06277b475c2a38cc10c47a1c108b5d6c27dcbfa45376929ff74727d5f3a23",
+                    "nonce" : "0x9b63f30e19ef9841",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4e94e222af2d7c9286d4f4d40ae85394b356ea772ceed6415513a9b35f593a0f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa04e94e222af2d7c9286d4f4d40ae85394b356ea772ceed6415513a9b35f593a0fa0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a07bb06277b475c2a38cc10c47a1c108b5d6c27dcbfa45376929ff74727d5f3a23889b63f30e19ef9841f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0f894511d307f1ecdcf5430824a297de9551a7079db22b81949239992caf95275a010cdb30865fad84176b4610c14718a4a06afa638324d6ae173b143496af48108c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xf894511d307f1ecdcf5430824a297de9551a7079db22b81949239992caf95275",
+                        "s" : "0x10cdb30865fad84176b4610c14718a4a06afa638324d6ae173b143496af48108",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf47de5cb76663c1aadcc775d0fdd7d84f79af149b19f3d8b975fe6836a309568",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g2v0.json
index 7a73a41bf..be69310e3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g2v0Filler.json",
+            "sourceHash" : "2124ee261e60b8bd9b4a168acb0dbd763c12b534dd73579c3dab6acee8ba7b8c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xad6105648704ca65f81a102f025efe9d31eadae4df9e869bc8be020d779bdf34",
+                    "mixHash" : "0xdb72283755e1bc0230f3097b95878e5539c884211454e772e6cc475bb6c3f918",
+                    "nonce" : "0xb5c1014c7c264a99",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x12c0fd03a90fc97f9487c472139dc3f88102646d72cdfdb6ccc9c48e8e14d908",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa012c0fd03a90fc97f9487c472139dc3f88102646d72cdfdb6ccc9c48e8e14d908a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0db72283755e1bc0230f3097b95878e5539c884211454e772e6cc475bb6c3f91888b5c1014c7c264a99f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0c3cd6910f36ea8a45f5e7f861759b3052a69965b37289b1185ba38c3eb568363a01965c2a36ab119ea229691b95382be03e514c022f9cfa09c2e1dd23978c084c5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc3cd6910f36ea8a45f5e7f861759b3052a69965b37289b1185ba38c3eb568363",
+                        "s" : "0x1965c2a36ab119ea229691b95382be03e514c022f9cfa09c2e1dd23978c084c5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xad6105648704ca65f81a102f025efe9d31eadae4df9e869bc8be020d779bdf34",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g3v0.json
index 7a73a41bf..8d1598aa3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g3v0Filler.json",
+            "sourceHash" : "196b0e0a67d7892828a7430510f32dc1143aad6c608f45c71345265f2f4d9042"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xfe572d08c2385bb2f3ba4c313cc48d082e305378456f9dcbde0cb2dfb3559371",
+                    "mixHash" : "0x7cd127ad2b68ba2823db5c1eb380322a4619896b83e7886512ef7a4f3eaf8bec",
+                    "nonce" : "0xe363ce3ad2db2e89",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x80499d87a9f81104a1d7269e7033fbf554ffdef6cd9f2576841a0788d44b86d2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa080499d87a9f81104a1d7269e7033fbf554ffdef6cd9f2576841a0788d44b86d2a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a07cd127ad2b68ba2823db5c1eb380322a4619896b83e7886512ef7a4f3eaf8bec88e363ce3ad2db2e89f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0263867e9527162126c30750aa8078703f32e1f5b0a5bc74e6348287879a003e3a01d47c1a5b0d2d1be39d77dc6820504031111da194954304e39e6bc75435b1c1fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x263867e9527162126c30750aa8078703f32e1f5b0a5bc74e6348287879a003e3",
+                        "s" : "0x1d47c1a5b0d2d1be39d77dc6820504031111da194954304e39e6bc75435b1c1f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfe572d08c2385bb2f3ba4c313cc48d082e305378456f9dcbde0cb2dfb3559371",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0.json
index 40c04b056..dc8606685 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_0_1_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0Filler.json",
             "sourceHash" : "25d9490549d93f623a9c25b6216e98ef82e5dc675d0142d083ccc806e8aad7e1"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x51a0bd1b80417492b9fa9ad27af0601460b7495a8157b7ff6670448692274167",
-                    "mixHash" : "0x4a61d331bfa670fe22d6b68244e4cf2f86427bda336fae71cf121d47413c5780",
-                    "nonce" : "0x76553d4bd69d3d78",
+                    "hash" : "0xcaacae0938d5398816cd72c09191051d18b67f88b47feafcfdec1f2a58d20222",
+                    "mixHash" : "0x76de77879c2709c1851bee70dbc80b649ecab2c7efcaa73063abdb0f38689757",
+                    "nonce" : "0x06591105e1d1f945",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x5e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa05e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741ea0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a04a61d331bfa670fe22d6b68244e4cf2f86427bda336fae71cf121d47413c57808876553d4bd69d3d78f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0ea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680a01a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99dc0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa05e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741ea0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a076de77879c2709c1851bee70dbc80b649ecab2c7efcaa73063abdb0f386897578806591105e1d1f945f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0ea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680a01a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51a0bd1b80417492b9fa9ad27af0601460b7495a8157b7ff6670448692274167",
+        "lastblockhash" : "0xcaacae0938d5398816cd72c09191051d18b67f88b47feafcfdec1f2a58d20222",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g1v0.json
index 7a73a41bf..8f9175341 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g1v0Filler.json",
+            "sourceHash" : "bded995079a4b57fb698ccc3a58b8303519431de4a6da290d49c549d48263899"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xdd4f245859281d7afe23bc70ea0cc41a5f82d2c8e05630c9dc13381a3e03f193",
+                    "mixHash" : "0xeb6f458e82b3960ce7a43b8ab6e064f76f883282edce6831386ae81dd4397523",
+                    "nonce" : "0x25cd8b8b6a444baf",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4e94e222af2d7c9286d4f4d40ae85394b356ea772ceed6415513a9b35f593a0f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa04e94e222af2d7c9286d4f4d40ae85394b356ea772ceed6415513a9b35f593a0fa0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0eb6f458e82b3960ce7a43b8ab6e064f76f883282edce6831386ae81dd43975238825cd8b8b6a444baff90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0f894511d307f1ecdcf5430824a297de9551a7079db22b81949239992caf95275a010cdb30865fad84176b4610c14718a4a06afa638324d6ae173b143496af48108c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xf894511d307f1ecdcf5430824a297de9551a7079db22b81949239992caf95275",
+                        "s" : "0x10cdb30865fad84176b4610c14718a4a06afa638324d6ae173b143496af48108",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdd4f245859281d7afe23bc70ea0cc41a5f82d2c8e05630c9dc13381a3e03f193",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g2v0.json
index 7a73a41bf..302742125 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g2v0Filler.json",
+            "sourceHash" : "4c256176fcaa176e36f2a0281e145e15b6b79fe08d08d1930202e762d3b1fbe6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xed32bcea5a38edaa66ce1ae1973159ee67cc861c712344e272180f5d82e33c19",
+                    "mixHash" : "0x6fcd47fe6cd37bf1aa7a4de0473c62f6362ac7928352876696aa7ca0f11a462e",
+                    "nonce" : "0x094dc0c6a8b5b7da",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x12c0fd03a90fc97f9487c472139dc3f88102646d72cdfdb6ccc9c48e8e14d908",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa012c0fd03a90fc97f9487c472139dc3f88102646d72cdfdb6ccc9c48e8e14d908a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a06fcd47fe6cd37bf1aa7a4de0473c62f6362ac7928352876696aa7ca0f11a462e88094dc0c6a8b5b7daf90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0c3cd6910f36ea8a45f5e7f861759b3052a69965b37289b1185ba38c3eb568363a01965c2a36ab119ea229691b95382be03e514c022f9cfa09c2e1dd23978c084c5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc3cd6910f36ea8a45f5e7f861759b3052a69965b37289b1185ba38c3eb568363",
+                        "s" : "0x1965c2a36ab119ea229691b95382be03e514c022f9cfa09c2e1dd23978c084c5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xed32bcea5a38edaa66ce1ae1973159ee67cc861c712344e272180f5d82e33c19",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g3v0.json
index 7a73a41bf..642bc5d92 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_0_1_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g3v0Filler.json",
+            "sourceHash" : "852a6657162915495ebdecce478670b3c89290b01ca9c2135f6a164bc28a43c9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xa05e860a71642ac3d4862e0aef2a8475abd426eb5bc186a4ad349287a3f9caff",
+                    "mixHash" : "0x23d29a2df49760f78b02e30e0682c215542ee9881fde065e7986ce88cbc3d76f",
+                    "nonce" : "0x0094bba8e41c51f4",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0xbd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x80499d87a9f81104a1d7269e7033fbf554ffdef6cd9f2576841a0788d44b86d2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bd272d564f64e174963e9049610bfc3f90dbc4602af1dd3566805ac5571bbb7fa080499d87a9f81104a1d7269e7033fbf554ffdef6cd9f2576841a0788d44b86d2a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a023d29a2df49760f78b02e30e0682c215542ee9881fde065e7986ce88cbc3d76f880094bba8e41c51f4f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0263867e9527162126c30750aa8078703f32e1f5b0a5bc74e6348287879a003e3a01d47c1a5b0d2d1be39d77dc6820504031111da194954304e39e6bc75435b1c1fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x263867e9527162126c30750aa8078703f32e1f5b0a5bc74e6348287879a003e3",
+                        "s" : "0x1d47c1a5b0d2d1be39d77dc6820504031111da194954304e39e6bc75435b1c1f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa05e860a71642ac3d4862e0aef2a8475abd426eb5bc186a4ad349287a3f9caff",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0.json
index 97fc71dba..722e5a033 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_1_1_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0Filler.json",
             "sourceHash" : "6436c541675694e945bfdd75e80b1816be925d6c0d9dd694d6d4e39ab78982cc"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0xd93491c8d7f41d11254b292ca93b32a454cf1dc9bb1b81a923458d6753cfa0c7",
-                    "mixHash" : "0xf1a4f8fa6d6ac10ac26e4bbd9e4ebfeb1fda02771eef3f4e6d5f604af2528874",
-                    "nonce" : "0xbb02b8eac946c24d",
+                    "hash" : "0x69061bb078dff8f8a9ebf078bef1d737b902747b9c5947a2330dc235979ae712",
+                    "mixHash" : "0xa0846a25b7192104c1e0ec7e771e42b32fe3ae925c97ffd28d2751dae6b4fa14",
+                    "nonce" : "0x9c53870c4e64710b",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xd3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0d3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0f1a4f8fa6d6ac10ac26e4bbd9e4ebfeb1fda02771eef3f4e6d5f604af252887488bb02b8eac946c24df90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba004012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40a03ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0d3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0a0846a25b7192104c1e0ec7e771e42b32fe3ae925c97ffd28d2751dae6b4fa14889c53870c4e64710bf90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba004012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40a03ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd93491c8d7f41d11254b292ca93b32a454cf1dc9bb1b81a923458d6753cfa0c7",
+        "lastblockhash" : "0x69061bb078dff8f8a9ebf078bef1d737b902747b9c5947a2330dc235979ae712",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g1v0.json
index 7a73a41bf..b40544268 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g1v0Filler.json",
+            "sourceHash" : "2e974af5f7c510ca70393069d4bd5b47a98d943fbb9c0f7b1c73df0e8eb3a250"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x93bb87068f597977deaa39ea94d97d30713e9d8d978eb08f63cefc1fa99b9ec7",
+                    "mixHash" : "0xcaa8970607047dc3ba8c6dc12d6927e85b83c92ad5eacc4e3eaaabfe842ceaf1",
+                    "nonce" : "0xe7dc3ce154b2a4bc",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xba4a5bf3f3eba069f062a1ab9612cab8e8b098455893ae369704ccbf3d7abbc9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0ba4a5bf3f3eba069f062a1ab9612cab8e8b098455893ae369704ccbf3d7abbc9a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0caa8970607047dc3ba8c6dc12d6927e85b83c92ad5eacc4e3eaaabfe842ceaf188e7dc3ce154b2a4bcf90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0bd74f740162d93f741ca4424125e14fd685aa4a7ba9ee055f38ac6aa3a82013da04865b9d10947f1dfc51a0373817a24510d18c4ffe70da8d7748b340ee17aed74c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbd74f740162d93f741ca4424125e14fd685aa4a7ba9ee055f38ac6aa3a82013d",
+                        "s" : "0x4865b9d10947f1dfc51a0373817a24510d18c4ffe70da8d7748b340ee17aed74",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x93bb87068f597977deaa39ea94d97d30713e9d8d978eb08f63cefc1fa99b9ec7",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g2v0.json
index 7a73a41bf..81245a81d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g2v0Filler.json",
+            "sourceHash" : "89aba5359d3e9ab49c5da9e487c0f8c4a449d105d3962250da7f188da718b5bf"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x1880b5bc793c322ef52fb4e3a3d224db2dfc3114ac12aa0e9a5e36e1e7c9b7a6",
+                    "mixHash" : "0xfd9072c12e4df9f63fe49cdc1c627059837f8dfc043bf4a40e1654ef4505e9ad",
+                    "nonce" : "0xd2d555c31cf589b4",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xed42fc70bf2cafaf7d20d894609b5139bae70a7c4ddd9516e392f20e2f87b994",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0ed42fc70bf2cafaf7d20d894609b5139bae70a7c4ddd9516e392f20e2f87b994a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0fd9072c12e4df9f63fe49cdc1c627059837f8dfc043bf4a40e1654ef4505e9ad88d2d555c31cf589b4f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca00ce9a30a24b4e58d857ec70537592508e63714951109e752ec5ed2d120f35ebaa025e6dae0368a4c8cdbe20aa97ef10d851d2703586376840e2f3fab1e696d6f2cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x0ce9a30a24b4e58d857ec70537592508e63714951109e752ec5ed2d120f35eba",
+                        "s" : "0x25e6dae0368a4c8cdbe20aa97ef10d851d2703586376840e2f3fab1e696d6f2c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1880b5bc793c322ef52fb4e3a3d224db2dfc3114ac12aa0e9a5e36e1e7c9b7a6",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g3v0.json
index 7a73a41bf..78fcdf9ef 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g3v0Filler.json",
+            "sourceHash" : "bd44bcb11947eda2593947d845727572095895f2829ccf112c24ed7571f80848"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xc7aea0a2bab176b59f201dbb60e7a612e6512d0a4cedbcf4e29bd75511651ea3",
+                    "mixHash" : "0xe51103be049c0f9c3b517026ea5fba4343206d3fab95e6c0268c011e96fff3ad",
+                    "nonce" : "0x584bf34c57fd7915",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7477ec8f295394fd5933bdaa1e150bff33599c921a080f5d062168d85ada7d8f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a07477ec8f295394fd5933bdaa1e150bff33599c921a080f5d062168d85ada7d8fa0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0e51103be049c0f9c3b517026ea5fba4343206d3fab95e6c0268c011e96fff3ad88584bf34c57fd7915f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0a82e32b46a5dd1de800852136858d079161611b25b31de8d7697b1061918c935a04da6b85a4e30a0a1e4b87da73278211d338261618c0bba90a45e40d3117b861cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xa82e32b46a5dd1de800852136858d079161611b25b31de8d7697b1061918c935",
+                        "s" : "0x4da6b85a4e30a0a1e4b87da73278211d338261618c0bba90a45e40d3117b861c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc7aea0a2bab176b59f201dbb60e7a612e6512d0a4cedbcf4e29bd75511651ea3",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0.json
index fd1984e36..9b79176ff 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_1_1_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0Filler.json",
             "sourceHash" : "1a18c075ebd26c7af2b6ee77009e6877362c50ac94850c1a5722ec2af310c5e6"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0xc744ea6418dd63aef71bb7591396f42714ec2d18f2619742f7d666548d90ae87",
-                    "mixHash" : "0x188a55eb547a25584048dd36b1f634a60fbb269f412a64aa710215cfcf9eda04",
-                    "nonce" : "0x88fbf693ad574270",
+                    "hash" : "0x2f6721f26d5623b63246bc0a8b70e6a6223b3003c6a0c906426eb9f9f61638b3",
+                    "mixHash" : "0x5e46d76f6a3c3dbc5d0b375dde3c82f0214b53c5e7eee7720c7655c5936e7ce8",
+                    "nonce" : "0xedcef2e7c87bae5b",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x3c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a03c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0188a55eb547a25584048dd36b1f634a60fbb269f412a64aa710215cfcf9eda048888fbf693ad574270f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0c4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45dfa07b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a03c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a05e46d76f6a3c3dbc5d0b375dde3c82f0214b53c5e7eee7720c7655c5936e7ce888edcef2e7c87bae5bf90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0c4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45dfa07b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc744ea6418dd63aef71bb7591396f42714ec2d18f2619742f7d666548d90ae87",
+        "lastblockhash" : "0x2f6721f26d5623b63246bc0a8b70e6a6223b3003c6a0c906426eb9f9f61638b3",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g1v0.json
index 7a73a41bf..023a3f59d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g1v0Filler.json",
+            "sourceHash" : "8c6e5d23a8e5bf9ec9ac690a0102ff59ac04216c3f045e26b6ddd146bcd6fb56"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x5e9209f173c3d80eebc6400c35dbf7480b3f4b0a41e7e64010c9ff44e10c3615",
+                    "mixHash" : "0x55777bb90ef457a9f90ad0fc20db74d2dd77c1bdd9aa17a6ca061f4eb8c455d2",
+                    "nonce" : "0xc2420efe76f6e6f1",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xba4a5bf3f3eba069f062a1ab9612cab8e8b098455893ae369704ccbf3d7abbc9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0ba4a5bf3f3eba069f062a1ab9612cab8e8b098455893ae369704ccbf3d7abbc9a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a055777bb90ef457a9f90ad0fc20db74d2dd77c1bdd9aa17a6ca061f4eb8c455d288c2420efe76f6e6f1f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0bd74f740162d93f741ca4424125e14fd685aa4a7ba9ee055f38ac6aa3a82013da04865b9d10947f1dfc51a0373817a24510d18c4ffe70da8d7748b340ee17aed74c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbd74f740162d93f741ca4424125e14fd685aa4a7ba9ee055f38ac6aa3a82013d",
+                        "s" : "0x4865b9d10947f1dfc51a0373817a24510d18c4ffe70da8d7748b340ee17aed74",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5e9209f173c3d80eebc6400c35dbf7480b3f4b0a41e7e64010c9ff44e10c3615",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g2v0.json
index 7a73a41bf..442252407 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g2v0Filler.json",
+            "sourceHash" : "e786770cf85dbf5a57979f4f3b4e4058e21c38c2c3c4cc0f7ca5e3079d352166"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x9f07cb884ac929322cd5b38f1bc3259e0c9cc0ae5e165c869523a7a861c062af",
+                    "mixHash" : "0x019116e7a5e22612203be767875d936c695d5cce007a5eb7af41360c2bbd46aa",
+                    "nonce" : "0xb6269540bcd77f47",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xed42fc70bf2cafaf7d20d894609b5139bae70a7c4ddd9516e392f20e2f87b994",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0ed42fc70bf2cafaf7d20d894609b5139bae70a7c4ddd9516e392f20e2f87b994a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0019116e7a5e22612203be767875d936c695d5cce007a5eb7af41360c2bbd46aa88b6269540bcd77f47f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca00ce9a30a24b4e58d857ec70537592508e63714951109e752ec5ed2d120f35ebaa025e6dae0368a4c8cdbe20aa97ef10d851d2703586376840e2f3fab1e696d6f2cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x0ce9a30a24b4e58d857ec70537592508e63714951109e752ec5ed2d120f35eba",
+                        "s" : "0x25e6dae0368a4c8cdbe20aa97ef10d851d2703586376840e2f3fab1e696d6f2c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9f07cb884ac929322cd5b38f1bc3259e0c9cc0ae5e165c869523a7a861c062af",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g3v0.json
index 7a73a41bf..a98036323 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g3v0Filler.json",
+            "sourceHash" : "1a1f09f7945ca71492032273b199a60f7241c74c670566bfaea479693ad5a7a5"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x38bbe15d383249ec645058f83047c98cc5760be4cf88ad2e7d58d81a2e79da22",
+                    "mixHash" : "0x892790b75636cd7a4739ce3abb5ade2403de67c83fdb48c2e6219f4d221cca2a",
+                    "nonce" : "0x332516c164dbc49d",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7477ec8f295394fd5933bdaa1e150bff33599c921a080f5d062168d85ada7d8f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a07477ec8f295394fd5933bdaa1e150bff33599c921a080f5d062168d85ada7d8fa0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0892790b75636cd7a4739ce3abb5ade2403de67c83fdb48c2e6219f4d221cca2a88332516c164dbc49df90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0a82e32b46a5dd1de800852136858d079161611b25b31de8d7697b1061918c935a04da6b85a4e30a0a1e4b87da73278211d338261618c0bba90a45e40d3117b861cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xa82e32b46a5dd1de800852136858d079161611b25b31de8d7697b1061918c935",
+                        "s" : "0x4da6b85a4e30a0a1e4b87da73278211d338261618c0bba90a45e40d3117b861c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x38bbe15d383249ec645058f83047c98cc5760be4cf88ad2e7d58d81a2e79da22",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0.json
index 1b7d9ad0e..810feb27f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_1_1_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0Filler.json",
             "sourceHash" : "0545ace168ddd7118df3d52afda610425d565e55fdffd917ef23de320b0593b5"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa82c",
-                    "hash" : "0xd4bf6797d0cddda864efe525f4d17cfb618e284c32ac92173c9fb37b4505b7e5",
-                    "mixHash" : "0x410fcd60ae5095f9fd2f4b86f7052561904162c3d2d2a9bbc23b1d78f0ef6d72",
-                    "nonce" : "0x2b35c65dcc85e513",
+                    "hash" : "0xdf5eb14d55c1e456c5357dddfd1e5d2c6c5d4a01e0f62047d127466a909b3e93",
+                    "mixHash" : "0x9e934e0e600cefb10612f01e28b1aef045bf0367ab489b16511a9df56f2297e2",
+                    "nonce" : "0xa05b45c662c6fa5c",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x7917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097b",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x86d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09d98447bd1127cca70444b67ba28c0212418acd6a68598c0ab14fcc175629cb0a086d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624da07917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a0410fcd60ae5095f9fd2f4b86f7052561904162c3d2d2a9bbc23b1d78f0ef6d72882b35c65dcc85e513f90127f90124010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba08d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8a03d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09d98447bd1127cca70444b67ba28c0212418acd6a68598c0ab14fcc175629cb0a086d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624da07917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a09e934e0e600cefb10612f01e28b1aef045bf0367ab489b16511a9df56f2297e288a05b45c662c6fa5cf90127f90124010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba08d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8a03d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd4bf6797d0cddda864efe525f4d17cfb618e284c32ac92173c9fb37b4505b7e5",
+        "lastblockhash" : "0xdf5eb14d55c1e456c5357dddfd1e5d2c6c5d4a01e0f62047d127466a909b3e93",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g1v0.json
index 7a73a41bf..ca00bb081 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g1v0Filler.json",
+            "sourceHash" : "96b276a3fa67f68306bb3637e54d5b1f31beb811f174d4ca853a8a7e1a8dfe12"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xd48c0b787c2ffa690206490bee9bcb416f12c4e1de778becac01813d4cf3cc23",
+                    "mixHash" : "0x6f54a167db08695465a1d3b94c69c1c68801de78d0c2c86e58c8518fad955924",
+                    "nonce" : "0x1f8736c2932824b5",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xba4a5bf3f3eba069f062a1ab9612cab8e8b098455893ae369704ccbf3d7abbc9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0ba4a5bf3f3eba069f062a1ab9612cab8e8b098455893ae369704ccbf3d7abbc9a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a06f54a167db08695465a1d3b94c69c1c68801de78d0c2c86e58c8518fad955924881f8736c2932824b5f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0bd74f740162d93f741ca4424125e14fd685aa4a7ba9ee055f38ac6aa3a82013da04865b9d10947f1dfc51a0373817a24510d18c4ffe70da8d7748b340ee17aed74c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbd74f740162d93f741ca4424125e14fd685aa4a7ba9ee055f38ac6aa3a82013d",
+                        "s" : "0x4865b9d10947f1dfc51a0373817a24510d18c4ffe70da8d7748b340ee17aed74",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd48c0b787c2ffa690206490bee9bcb416f12c4e1de778becac01813d4cf3cc23",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g2v0.json
index 7a73a41bf..ee5837466 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g2v0Filler.json",
+            "sourceHash" : "502813ece6982b9afdecd2aaf34712043884c4c908741220b190a94e3c956272"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x87fbbdc89b4fac8bfad46f8d3e45a955a31b38582d0e2cad57516b33853f3a39",
+                    "mixHash" : "0x6c100bb11414bb3aeff7f8572399dff2329a1af07044d3dcd035c4942f786368",
+                    "nonce" : "0x9efdf67fbedb9d44",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xed42fc70bf2cafaf7d20d894609b5139bae70a7c4ddd9516e392f20e2f87b994",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0ed42fc70bf2cafaf7d20d894609b5139bae70a7c4ddd9516e392f20e2f87b994a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a06c100bb11414bb3aeff7f8572399dff2329a1af07044d3dcd035c4942f786368889efdf67fbedb9d44f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca00ce9a30a24b4e58d857ec70537592508e63714951109e752ec5ed2d120f35ebaa025e6dae0368a4c8cdbe20aa97ef10d851d2703586376840e2f3fab1e696d6f2cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x0ce9a30a24b4e58d857ec70537592508e63714951109e752ec5ed2d120f35eba",
+                        "s" : "0x25e6dae0368a4c8cdbe20aa97ef10d851d2703586376840e2f3fab1e696d6f2c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x87fbbdc89b4fac8bfad46f8d3e45a955a31b38582d0e2cad57516b33853f3a39",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g3v0.json
index 7a73a41bf..ce5714693 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g3v0Filler.json",
+            "sourceHash" : "6bdbfb4d3547cd82c9e0b9be2ca8debe623ecf23215408296fbe543980352161"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x8bebd6c1504a1cb671c53991464244f3fc8a65ca79ba2dd3c03bb749314acfe0",
+                    "mixHash" : "0xfa8267c0028c9dcf2e66105422fed006b897e6ea298a11de11a381a629261f0c",
+                    "nonce" : "0xae6f49f9fcc813ef",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7477ec8f295394fd5933bdaa1e150bff33599c921a080f5d062168d85ada7d8f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a07477ec8f295394fd5933bdaa1e150bff33599c921a080f5d062168d85ada7d8fa0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0fa8267c0028c9dcf2e66105422fed006b897e6ea298a11de11a381a629261f0c88ae6f49f9fcc813eff90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0a82e32b46a5dd1de800852136858d079161611b25b31de8d7697b1061918c935a04da6b85a4e30a0a1e4b87da73278211d338261618c0bba90a45e40d3117b861cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xa82e32b46a5dd1de800852136858d079161611b25b31de8d7697b1061918c935",
+                        "s" : "0x4da6b85a4e30a0a1e4b87da73278211d338261618c0bba90a45e40d3117b861c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8bebd6c1504a1cb671c53991464244f3fc8a65ca79ba2dd3c03bb749314acfe0",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0.json
index 4a93056c6..462a8f77f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_1_1_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0Filler.json",
             "sourceHash" : "4d3ff3589bcbc5aa8d83732f86306f593a7c44f1351b7f9a7cafa5defa3db2ab"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x506b8d5009eb7d7dae6ce2c7366dc6812e1cfb10d5d30ae1aa5eb3110b76ef1f",
-                    "mixHash" : "0x49dd2365b9470c06211bdfc13d105df79e5ee67b1c61afbe701a29ef61b75ff6",
-                    "nonce" : "0xd3c87ae16fb27774",
+                    "hash" : "0xadec63f0147fbe4b917353f8bba5ffb2206df57aee4ac43dc5c155c14b5f591d",
+                    "mixHash" : "0xec981f88bad4179457d3933afebb93a279d98b6ab4e58902e816693e3cdfbfd9",
+                    "nonce" : "0x04948689aea4193f",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x22885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a022885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42ea0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a049dd2365b9470c06211bdfc13d105df79e5ee67b1c61afbe701a29ef61b75ff688d3c87ae16fb27774f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca093331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61a004ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848bec0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a022885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42ea0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0ec981f88bad4179457d3933afebb93a279d98b6ab4e58902e816693e3cdfbfd98804948689aea4193ff90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca093331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61a004ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848bec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x506b8d5009eb7d7dae6ce2c7366dc6812e1cfb10d5d30ae1aa5eb3110b76ef1f",
+        "lastblockhash" : "0xadec63f0147fbe4b917353f8bba5ffb2206df57aee4ac43dc5c155c14b5f591d",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g1v0.json
index 7a73a41bf..31846f1c0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g1v0Filler.json",
+            "sourceHash" : "1c86e725cb610e5dcf9d9223255d9012f66ed45a70357e460f7fa2f83449ab5a"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xd96cd69d875981a92f50e68181b59dfb8cb8e8f188cd07b0481b06cffdc6aac5",
+                    "mixHash" : "0x3d7c5a3d7df526916fb904eac435546f69d96269f9625d1cf3693664cc61b944",
+                    "nonce" : "0x87a35d91ff591525",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xba4a5bf3f3eba069f062a1ab9612cab8e8b098455893ae369704ccbf3d7abbc9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0ba4a5bf3f3eba069f062a1ab9612cab8e8b098455893ae369704ccbf3d7abbc9a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a03d7c5a3d7df526916fb904eac435546f69d96269f9625d1cf3693664cc61b9448887a35d91ff591525f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0bd74f740162d93f741ca4424125e14fd685aa4a7ba9ee055f38ac6aa3a82013da04865b9d10947f1dfc51a0373817a24510d18c4ffe70da8d7748b340ee17aed74c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbd74f740162d93f741ca4424125e14fd685aa4a7ba9ee055f38ac6aa3a82013d",
+                        "s" : "0x4865b9d10947f1dfc51a0373817a24510d18c4ffe70da8d7748b340ee17aed74",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd96cd69d875981a92f50e68181b59dfb8cb8e8f188cd07b0481b06cffdc6aac5",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g2v0.json
index 7a73a41bf..d1738c8e8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g2v0Filler.json",
+            "sourceHash" : "90db371a74cdb21f72e242ce72313769c9c3d6477753dd33a28b9630aaa1817d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x5c411baaaa6445ce6269913318bc22d56c0597f17b540666120ab184b360260c",
+                    "mixHash" : "0x3086564a7540000ee18925d8eea870e869a9c0a97efeaee26c5c0313e2acf249",
+                    "nonce" : "0x064446af428980f1",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xed42fc70bf2cafaf7d20d894609b5139bae70a7c4ddd9516e392f20e2f87b994",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0ed42fc70bf2cafaf7d20d894609b5139bae70a7c4ddd9516e392f20e2f87b994a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a03086564a7540000ee18925d8eea870e869a9c0a97efeaee26c5c0313e2acf24988064446af428980f1f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca00ce9a30a24b4e58d857ec70537592508e63714951109e752ec5ed2d120f35ebaa025e6dae0368a4c8cdbe20aa97ef10d851d2703586376840e2f3fab1e696d6f2cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x0ce9a30a24b4e58d857ec70537592508e63714951109e752ec5ed2d120f35eba",
+                        "s" : "0x25e6dae0368a4c8cdbe20aa97ef10d851d2703586376840e2f3fab1e696d6f2c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5c411baaaa6445ce6269913318bc22d56c0597f17b540666120ab184b360260c",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g3v0.json
index 7a73a41bf..9e6c9b321 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g3v0Filler.json",
+            "sourceHash" : "d33fd5ed2513c7a8a981f772fb2da71bd198c173791f443b8158b1a09f886ba8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xcef474b4aa457b02d0a262990191492e690a6799de4cd4fd1cbebf892a3e4300",
+                    "mixHash" : "0x0e97198aba8563c594eef3b116e8c2fdb2db1f1887198413147c1851cee5fa31",
+                    "nonce" : "0x081febda898ad370",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7477ec8f295394fd5933bdaa1e150bff33599c921a080f5d062168d85ada7d8f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a07477ec8f295394fd5933bdaa1e150bff33599c921a080f5d062168d85ada7d8fa0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a00e97198aba8563c594eef3b116e8c2fdb2db1f1887198413147c1851cee5fa3188081febda898ad370f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0a82e32b46a5dd1de800852136858d079161611b25b31de8d7697b1061918c935a04da6b85a4e30a0a1e4b87da73278211d338261618c0bba90a45e40d3117b861cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xa82e32b46a5dd1de800852136858d079161611b25b31de8d7697b1061918c935",
+                        "s" : "0x4da6b85a4e30a0a1e4b87da73278211d338261618c0bba90a45e40d3117b861c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcef474b4aa457b02d0a262990191492e690a6799de4cd4fd1cbebf892a3e4300",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0.json
index 649c28bc0..fa3f7ce85 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_1_1_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0Filler.json",
             "sourceHash" : "4316e7684e81877cd273f3f0a24bb83d77775eb51ba5ebe4bb4dc244ec50dc2e"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x16c126e7194186b7b1aa1ea0b63e8890b2a62964af1cf4754abf277b267b512e",
-                    "mixHash" : "0xb4ca9df40cac8c8b4030b4ec69cb29951f0d5de5fd63d29ea192740e9c887dd9",
-                    "nonce" : "0xd033e15f265788e0",
+                    "hash" : "0xd3b39e5a15442225ebd652b26f5fa2a658f64d54a93c178a75e37e1ab17eaa44",
+                    "mixHash" : "0x25cedabaf4b46d0551d881f35cbcacd96b5c69203035ebd517f2533a9231aa83",
+                    "nonce" : "0xbdb516d1e025b505",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x9a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a09a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356ea0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0b4ca9df40cac8c8b4030b4ec69cb29951f0d5de5fd63d29ea192740e9c887dd988d033e15f265788e0f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0b3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433a074f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790ec0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a09a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356ea0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a025cedabaf4b46d0551d881f35cbcacd96b5c69203035ebd517f2533a9231aa8388bdb516d1e025b505f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0b3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433a074f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16c126e7194186b7b1aa1ea0b63e8890b2a62964af1cf4754abf277b267b512e",
+        "lastblockhash" : "0xd3b39e5a15442225ebd652b26f5fa2a658f64d54a93c178a75e37e1ab17eaa44",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g1v0.json
index 7a73a41bf..29b3a33c9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g1v0Filler.json",
+            "sourceHash" : "b669da15c33b77acb5b2934523f210a94b7d8415e076b88f8eb5aca6b0938c6a"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x95ebd4d3f4a95a556cc57f35968d89f8777b8e05249c7170b5f3f9d7a3bd8636",
+                    "mixHash" : "0x41dcc93231bfe081ce7e410bbec92fd95b3efb2c7d652a3746e46a3fd972ab90",
+                    "nonce" : "0x14afc005bc7d055a",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xba4a5bf3f3eba069f062a1ab9612cab8e8b098455893ae369704ccbf3d7abbc9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0ba4a5bf3f3eba069f062a1ab9612cab8e8b098455893ae369704ccbf3d7abbc9a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a041dcc93231bfe081ce7e410bbec92fd95b3efb2c7d652a3746e46a3fd972ab908814afc005bc7d055af90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0bd74f740162d93f741ca4424125e14fd685aa4a7ba9ee055f38ac6aa3a82013da04865b9d10947f1dfc51a0373817a24510d18c4ffe70da8d7748b340ee17aed74c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbd74f740162d93f741ca4424125e14fd685aa4a7ba9ee055f38ac6aa3a82013d",
+                        "s" : "0x4865b9d10947f1dfc51a0373817a24510d18c4ffe70da8d7748b340ee17aed74",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x95ebd4d3f4a95a556cc57f35968d89f8777b8e05249c7170b5f3f9d7a3bd8636",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g2v0.json
index 7a73a41bf..b160379b2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g2v0Filler.json",
+            "sourceHash" : "97ed3a54804decb315846020da8e47056bb477d952a1f71c6c90c05f09232751"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xa05505856fad39356958c3b62435a87248a062704f412b958e23eae67b0992c5",
+                    "mixHash" : "0x372e4196d15d8ba79823e3d97410c2ac5558d3f07d2a12969decca9d9c92bc0a",
+                    "nonce" : "0xf9d5facb7799ba51",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xed42fc70bf2cafaf7d20d894609b5139bae70a7c4ddd9516e392f20e2f87b994",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0ed42fc70bf2cafaf7d20d894609b5139bae70a7c4ddd9516e392f20e2f87b994a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0372e4196d15d8ba79823e3d97410c2ac5558d3f07d2a12969decca9d9c92bc0a88f9d5facb7799ba51f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca00ce9a30a24b4e58d857ec70537592508e63714951109e752ec5ed2d120f35ebaa025e6dae0368a4c8cdbe20aa97ef10d851d2703586376840e2f3fab1e696d6f2cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x0ce9a30a24b4e58d857ec70537592508e63714951109e752ec5ed2d120f35eba",
+                        "s" : "0x25e6dae0368a4c8cdbe20aa97ef10d851d2703586376840e2f3fab1e696d6f2c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa05505856fad39356958c3b62435a87248a062704f412b958e23eae67b0992c5",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g3v0.json
index 7a73a41bf..525a260d1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g3v0Filler.json",
+            "sourceHash" : "b7ea802795bfd36ba0b6f15a805e8c9a18c8ee57019400b094954f4d6f6026e7"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x7cacb8ef1047aff5464df0201cde238b7838c44587cb394b312bece8b281c430",
+                    "mixHash" : "0x0b3e8a310cab8f63e7a69df519a788715e9592d6aa6ee9564ed092b2d672c78a",
+                    "nonce" : "0x0b833e4442d178ab",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7477ec8f295394fd5933bdaa1e150bff33599c921a080f5d062168d85ada7d8f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a07477ec8f295394fd5933bdaa1e150bff33599c921a080f5d062168d85ada7d8fa0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a00b3e8a310cab8f63e7a69df519a788715e9592d6aa6ee9564ed092b2d672c78a880b833e4442d178abf90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0a82e32b46a5dd1de800852136858d079161611b25b31de8d7697b1061918c935a04da6b85a4e30a0a1e4b87da73278211d338261618c0bba90a45e40d3117b861cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xa82e32b46a5dd1de800852136858d079161611b25b31de8d7697b1061918c935",
+                        "s" : "0x4da6b85a4e30a0a1e4b87da73278211d338261618c0bba90a45e40d3117b861c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7cacb8ef1047aff5464df0201cde238b7838c44587cb394b312bece8b281c430",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0.json
index 1c1c7ee17..cd8e52388 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_1_1_1_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0Filler.json",
             "sourceHash" : "39137c19ea9d01799c2c8c316acad488ea2b0a9515e431cfcfb4ca922d3d8c40"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x628be7d4d81c43c0d1342dd8761320262dc17b46e9ee57c0c2e110e567429741",
-                    "mixHash" : "0x1789005da3e3447542a558ae6c3e65ab2c85e348a5d3a6b62e862ee7ca344d23",
-                    "nonce" : "0x003dec21086e01c8",
+                    "hash" : "0x4319ba6ab1bc1ff4fe0c3d7941193877eb67023587468e4471221084cc4ff52d",
+                    "mixHash" : "0x83491b57dadcc6093493561bbdd8b52710d7ee53f94c2f54969c4ca85d4b0f45",
+                    "nonce" : "0xcc831bc859bf0e41",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a01789005da3e3447542a558ae6c3e65ab2c85e348a5d3a6b62e862ee7ca344d2388003dec21086e01c8f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156da045875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5cc0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a083491b57dadcc6093493561bbdd8b52710d7ee53f94c2f54969c4ca85d4b0f4588cc831bc859bf0e41f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156da045875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x628be7d4d81c43c0d1342dd8761320262dc17b46e9ee57c0c2e110e567429741",
+        "lastblockhash" : "0x4319ba6ab1bc1ff4fe0c3d7941193877eb67023587468e4471221084cc4ff52d",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g1v0.json
index 7a73a41bf..19fec828c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g1v0Filler.json",
+            "sourceHash" : "1836ad67317adef4312743e2fdc101e1ec2009e708e305088bb47b4a89fe696d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x30efef3c9539a8e1fa5b6db0ef9ed2f4bab1e82dd023504643038bb1e965652d",
+                    "mixHash" : "0x3d916b6e1914637e19660f9428f297838cba5a0d624c24942bfdcaa6490c29fe",
+                    "nonce" : "0x6e6a220995dab94f",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xba4a5bf3f3eba069f062a1ab9612cab8e8b098455893ae369704ccbf3d7abbc9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0ba4a5bf3f3eba069f062a1ab9612cab8e8b098455893ae369704ccbf3d7abbc9a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a03d916b6e1914637e19660f9428f297838cba5a0d624c24942bfdcaa6490c29fe886e6a220995dab94ff90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0bd74f740162d93f741ca4424125e14fd685aa4a7ba9ee055f38ac6aa3a82013da04865b9d10947f1dfc51a0373817a24510d18c4ffe70da8d7748b340ee17aed74c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbd74f740162d93f741ca4424125e14fd685aa4a7ba9ee055f38ac6aa3a82013d",
+                        "s" : "0x4865b9d10947f1dfc51a0373817a24510d18c4ffe70da8d7748b340ee17aed74",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x30efef3c9539a8e1fa5b6db0ef9ed2f4bab1e82dd023504643038bb1e965652d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g2v0.json
index 7a73a41bf..9432e2f2e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g2v0Filler.json",
+            "sourceHash" : "64512b81b650a389898b368a034b7a2bd2b7c096ed41a49208adccebd47f3fbc"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x9276cb7631f24fa150c32b129cfb65baa24a4209bcec23dcba8d3cecad5d536d",
+                    "mixHash" : "0xcb5518b2844e2da617047ef37cafe5cf3a54f41cc3ec0ccfa5655358c8fa49cd",
+                    "nonce" : "0xa223ef26813b5d32",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xed42fc70bf2cafaf7d20d894609b5139bae70a7c4ddd9516e392f20e2f87b994",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a0ed42fc70bf2cafaf7d20d894609b5139bae70a7c4ddd9516e392f20e2f87b994a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0cb5518b2844e2da617047ef37cafe5cf3a54f41cc3ec0ccfa5655358c8fa49cd88a223ef26813b5d32f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca00ce9a30a24b4e58d857ec70537592508e63714951109e752ec5ed2d120f35ebaa025e6dae0368a4c8cdbe20aa97ef10d851d2703586376840e2f3fab1e696d6f2cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x0ce9a30a24b4e58d857ec70537592508e63714951109e752ec5ed2d120f35eba",
+                        "s" : "0x25e6dae0368a4c8cdbe20aa97ef10d851d2703586376840e2f3fab1e696d6f2c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9276cb7631f24fa150c32b129cfb65baa24a4209bcec23dcba8d3cecad5d536d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g3v0.json
index 7a73a41bf..e8b436db7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_1_1_1_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g3v0Filler.json",
+            "sourceHash" : "56ba08b5943b4901761b1e1541c99a5d5d662ef776aefa75f15a5e8ab8df2df0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x78cc2d2836dc104dc2f1ee23da1f5ddceb32ab857ac210416eda863a36fcd15a",
+                    "mixHash" : "0xb833a8a065995f4e46365898fcabd79c6595d39257a97c8a9d468cd08c16546c",
+                    "nonce" : "0x6580b058fd2171e1",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xbeba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7477ec8f295394fd5933bdaa1e150bff33599c921a080f5d062168d85ada7d8f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0beba61be9f9a7ce45bcf5502fe53021bc7480eb53bce83c849da8a3642b411d3a07477ec8f295394fd5933bdaa1e150bff33599c921a080f5d062168d85ada7d8fa0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0b833a8a065995f4e46365898fcabd79c6595d39257a97c8a9d468cd08c16546c886580b058fd2171e1f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0a82e32b46a5dd1de800852136858d079161611b25b31de8d7697b1061918c935a04da6b85a4e30a0a1e4b87da73278211d338261618c0bba90a45e40d3117b861cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xa82e32b46a5dd1de800852136858d079161611b25b31de8d7697b1061918c935",
+                        "s" : "0x4da6b85a4e30a0a1e4b87da73278211d338261618c0bba90a45e40d3117b861c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x78cc2d2836dc104dc2f1ee23da1f5ddceb32ab857ac210416eda863a36fcd15a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0.json
index 2435e416f..3f5fa9baa 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_22411_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0Filler.json",
-            "sourceHash" : "6de3a63a45203e4ad2c6abd7e5cf8f22d44217b55fa2f305cdc37fff02d3e023"
+            "sourceHash" : "299a6693eefd5b78f4579c3cc6a56e9a489b550e4de41ce988c6b85b59f6d00f"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1c8",
-                    "hash" : "0x0f25e00ad4881428e361513ed3f08b5b9857ea1e0faa58e065b8ce6f2affcd91",
-                    "mixHash" : "0x4fd9062ab84d5d12cb137ab0f03f0c557cfa364433219f1e107bca88707b368f",
-                    "nonce" : "0x5f2b66edb51fe566",
+                    "hash" : "0x46a29f2cf6888f602be31ee70230ef7026800439859bd6d7bc1ee1b70ee2dd35",
+                    "mixHash" : "0x7fb08080abc8c94f435540687a254d8d034234be025777c5d2776b0ba4d53c08",
+                    "nonce" : "0x47b0cf885f250df1",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601ed",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0715bf751aac85ccf3294a7f128e486679ea0fbef05ea7683d78959457c767ca2a0ac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9a0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a04fd9062ab84d5d12cb137ab0f03f0c557cfa364433219f1e107bca88707b368f885f2b66edb51fe566f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba059a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855a02a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fdc0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0715bf751aac85ccf3294a7f128e486679ea0fbef05ea7683d78959457c767ca2a0ac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9a0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a07fb08080abc8c94f435540687a254d8d034234be025777c5d2776b0ba4d53c088847b0cf885f250df1f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba059a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855a02a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fdc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f25e00ad4881428e361513ed3f08b5b9857ea1e0faa58e065b8ce6f2affcd91",
+        "lastblockhash" : "0x46a29f2cf6888f602be31ee70230ef7026800439859bd6d7bc1ee1b70ee2dd35",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g1v0.json
index 7a73a41bf..19936567b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_22411_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g1v0Filler.json",
+            "sourceHash" : "1038100612c1f8aeddd960bad9a1347da199931fd5c634b5b1e9444b07391f6f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x6bb1340d68e15a4a3045ecce86091c9833d2f1ed6ac57b62284d675f61a3e13b",
+                    "mixHash" : "0x4ee291477155487f2a23994b20b35724f8360600fe771a33eb616d63ed452c97",
+                    "nonce" : "0x128c4fe13d3147d6",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xfcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9e551e19bcf325eb42d6e04a7ea19e1428f082a68645c68197c4dd62b6fab22d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2ea09e551e19bcf325eb42d6e04a7ea19e1428f082a68645c68197c4dd62b6fab22da022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a04ee291477155487f2a23994b20b35724f8360600fe771a33eb616d63ed452c9788128c4fe13d3147d6f90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba02c589cfead49893491fbe5d82a33402c366c905d77f160a5f01b2c08aa73b2c0a049202fc3f90d64bdfcdca492e1c4c294239e24244769d0296c9b7dba21eb9b7bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2c589cfead49893491fbe5d82a33402c366c905d77f160a5f01b2c08aa73b2c0",
+                        "s" : "0x49202fc3f90d64bdfcdca492e1c4c294239e24244769d0296c9b7dba21eb9b7b",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6bb1340d68e15a4a3045ecce86091c9833d2f1ed6ac57b62284d675f61a3e13b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g2v0.json
index 7a73a41bf..700d2d2ca 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_22411_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g2v0Filler.json",
+            "sourceHash" : "3d5fe18060339c49cc713e7c6946ecfbf84b95757f5fe8b00444e74bb99eb5f4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x27d63d0f44a1e0e1e2a3f6e19c6a2d2fc90a1aa5a7316bd0b77c1e5153b33d31",
+                    "mixHash" : "0x303790399fa1379ec4eec8c27a81192855e50dde6367476141dae0af8d37f1c4",
+                    "nonce" : "0x4ffaa021d7e56fa2",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xa658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0eeb6cc1ffe72b2a93964cc523f66629ed72bf1021f589279a11118cab2f99b0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819a00eeb6cc1ffe72b2a93964cc523f66629ed72bf1021f589279a11118cab2f99b0a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a0303790399fa1379ec4eec8c27a81192855e50dde6367476141dae0af8d37f1c4884ffaa021d7e56fa2f90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba03d02bf4e787e1ea6225ff3c295e1d2c680489bbcbe88908aab279c15e136bdc1a04aa72430be82743a7c35c41e69a957e51e7ffbfd35edaff76257ed9f454955b9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3d02bf4e787e1ea6225ff3c295e1d2c680489bbcbe88908aab279c15e136bdc1",
+                        "s" : "0x4aa72430be82743a7c35c41e69a957e51e7ffbfd35edaff76257ed9f454955b9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x27d63d0f44a1e0e1e2a3f6e19c6a2d2fc90a1aa5a7316bd0b77c1e5153b33d31",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g3v0.json
index 7a73a41bf..794094676 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_22411_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g3v0Filler.json",
+            "sourceHash" : "fb945a9e5d80c07a8308d2e04fb967fabf61363873c658c6d9929f0ff31e15d1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xb250737765147336d648660304703623da154509b80d68c07055f0c5f9634fa6",
+                    "mixHash" : "0x220abc3fad9bc5c4e2f450146866be0d1dfcce9ff2b7366fa4e0df3ccbd030f4",
+                    "nonce" : "0x04c2901d2a6a1219",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0xadd3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x664f9aba117024b86e246325a0b7bbf5c0ca42bb578a6e267da15a0ae04587d9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0add3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50a0664f9aba117024b86e246325a0b7bbf5c0ca42bb578a6e267da15a0ae04587d9a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0220abc3fad9bc5c4e2f450146866be0d1dfcce9ff2b7366fa4e0df3ccbd030f48804c2901d2a6a1219f90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0e8d93ad1bd1e9cfe4d4ed987c7599dd2fc5e8fa15d71ac7ed4c472920d31e2fba05faa6f1e0bfda79a5e46d8f35ca83e8ee80ceb48513f4894763f0faa25629bf8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xe8d93ad1bd1e9cfe4d4ed987c7599dd2fc5e8fa15d71ac7ed4c472920d31e2fb",
+                        "s" : "0x5faa6f1e0bfda79a5e46d8f35ca83e8ee80ceb48513f4894763f0faa25629bf8",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb250737765147336d648660304703623da154509b80d68c07055f0c5f9634fa6",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0.json
index 9f6ef9db7..7ae1a1ac3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_37120_37111_0_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0Filler.json",
             "sourceHash" : "d71f026a18e1fcca56552b3e0d46f767d4bd3f937289b2325ff073f59e0bd917"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0b544b",
-                    "hash" : "0xa483e212c5efacce26766373624ee970c74337d5b115d764dd1ea11bab7559c8",
-                    "mixHash" : "0xd65fdc97407a4555fd3167083d4a89748bcd454df3c7cb23763383974a9ede23",
-                    "nonce" : "0x738a88e073504483",
+                    "hash" : "0xe29b2c70b2d07d216e77c4e2b2ac06a6bc46aacb4596400103ba2adabc749fc9",
+                    "mixHash" : "0x17010dd85f101c59f6da939407eebdd2010c17f27b6dbebde754a9ae46286478",
+                    "nonce" : "0xfb14db55b86d48f2",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0x885264095681600c0d0f81dc0862ed6c58535e5cf5c36b0e175cf588e39e1140",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f64587d3ca797a3ca5bed64df9829519563f9c451e96609e8884522622085f29a056f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64a0885264095681600c0d0f81dc0862ed6c58535e5cf5c36b0e175cf588e39e1140b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830b544b8203e880a0d65fdc97407a4555fd3167083d4a89748bcd454df3c7cb23763383974a9ede2388738a88e073504483f90209f902060101830fdd1894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9a04615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8c0",
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f64587d3ca797a3ca5bed64df9829519563f9c451e96609e8884522622085f29a056f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64a0885264095681600c0d0f81dc0862ed6c58535e5cf5c36b0e175cf588e39e1140b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830b544b8203e880a017010dd85f101c59f6da939407eebdd2010c17f27b6dbebde754a9ae4628647888fb14db55b86d48f2f90209f902060101830fdd1894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9a04615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa483e212c5efacce26766373624ee970c74337d5b115d764dd1ea11bab7559c8",
+        "lastblockhash" : "0xe29b2c70b2d07d216e77c4e2b2ac06a6bc46aacb4596400103ba2adabc749fc9",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g1v0.json
index 7a73a41bf..852d6ef68 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g1v0Filler.json",
+            "sourceHash" : "8bdbd11fc45b8a597b55fe76d985f5333ba09e7c3dd7a163979acefaa53b83d0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x29105dfbff804a1c60633870ca17ceaf36014a0dc7a062720c081fc0203757b8",
+                    "mixHash" : "0xa0a5cc980f020f5f846d1bde547b8254a6c7976a485def5f0c068754d620024f",
+                    "nonce" : "0x21032a23319547af",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xd8c9749e47005be4a5920a48bbd6d7eb95c1ea84d5352ce2fdc6a707d427bff4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3b033a0ecb8c82946a3c83810f68dc19f36a3b8ddea8c50f8e032da406e30632",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d8c9749e47005be4a5920a48bbd6d7eb95c1ea84d5352ce2fdc6a707d427bff4a03b033a0ecb8c82946a3c83810f68dc19f36a3b8ddea8c50f8e032da406e30632a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0a0a5cc980f020f5f846d1bde547b8254a6c7976a485def5f0c068754d620024f8821032a23319547aff90209f90206010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca05d7791c2c9d618a1614cb09ff8bde0c7573c9632611d609a4b6c88de1e1abdbda037457e745a1506f3092b1b52982c5cd1a86c0f980ef8d3cae4a94bb2c8bd7781c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5d7791c2c9d618a1614cb09ff8bde0c7573c9632611d609a4b6c88de1e1abdbd",
+                        "s" : "0x37457e745a1506f3092b1b52982c5cd1a86c0f980ef8d3cae4a94bb2c8bd7781",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x29105dfbff804a1c60633870ca17ceaf36014a0dc7a062720c081fc0203757b8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g2v0.json
index 7a73a41bf..2171eba7b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g2v0Filler.json",
+            "sourceHash" : "9c09f4700171714b3d236a565e8293e3139b03bd7ed1acfd2cafcd489188ffb1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0xf6005ecb09c9903b2560b9edf7f155c7468af5b3d43e0e5c3b076851e1a0a6f2",
+                    "mixHash" : "0x9217d54741a20ee385e393cb0f8caf25fc81eca53a4aa5631cf695c8920696e8",
+                    "nonce" : "0x859d37a4974d79e6",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x21517e54756b572405a588dee774b0ea32e2bd383e196464c7f2e71dbeac7750",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa0e9e440d34b5aac57dabc51502d504acdbf9f919a076e58d263ea8ad8553378",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a021517e54756b572405a588dee774b0ea32e2bd383e196464c7f2e71dbeac7750a0a0e9e440d34b5aac57dabc51502d504acdbf9f919a076e58d263ea8ad8553378a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a09217d54741a20ee385e393cb0f8caf25fc81eca53a4aa5631cf695c8920696e888859d37a4974d79e6f90209f9020601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca0bc3b29699392e4dc158ae440a2daa70cbffc28a55bca3ae1adba82ac7c042bb4a057716946d6f82b100a838a36d74ee5977d2603a9b2a2625fb707f2c2c586915dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbc3b29699392e4dc158ae440a2daa70cbffc28a55bca3ae1adba82ac7c042bb4",
+                        "s" : "0x57716946d6f82b100a838a36d74ee5977d2603a9b2a2625fb707f2c2c586915d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf6005ecb09c9903b2560b9edf7f155c7468af5b3d43e0e5c3b076851e1a0a6f2",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g3v0.json
index 7a73a41bf..e8daa0060 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g3v0Filler.json",
+            "sourceHash" : "df2606a3d1a1ccae5b986523415a34ebfbe4d6d65dd741f74ba64045a5515fd8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x8675f555613f6d7f3d34104e9b4ecf40a4e8f9850346cce42a8d92f1c2ac8300",
+                    "mixHash" : "0xcb2e4be582e730914a854beac697a02dd0c87423af43920b5d25562067c23da3",
+                    "nonce" : "0x27bc32422badda7a",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x12291eed04feb7fc2da5623b4c888b5801c3331a3b067aeb06f6d8cf62e15881",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x992a54fef1becfc6aefd3b90e3cec6c788da09df3682fb6a1a1db999bfc7973b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a012291eed04feb7fc2da5623b4c888b5801c3331a3b067aeb06f6d8cf62e15881a0992a54fef1becfc6aefd3b90e3cec6c788da09df3682fb6a1a1db999bfc7973ba0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0cb2e4be582e730914a854beac697a02dd0c87423af43920b5d25562067c23da38827bc32422badda7af90209f90206010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba03d056fcbf5bdc7380d8439f1ebb4ae949af69e60afd9fb420a94bbe1c9a5bf7fa0397f444c125b479b35bfebef978e94a6247810be4b157d019acef1fe1d0115fdc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3d056fcbf5bdc7380d8439f1ebb4ae949af69e60afd9fb420a94bbe1c9a5bf7f",
+                        "s" : "0x397f444c125b479b35bfebef978e94a6247810be4b157d019acef1fe1d0115fd",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8675f555613f6d7f3d34104e9b4ecf40a4e8f9850346cce42a8d92f1c2ac8300",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0.json
index 4626c7599..86738c2d2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_0_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0Filler.json",
-            "sourceHash" : "d28dc337d72d2a247f11863fa3042798ecd964637653e57dd2f154cdc34f3b0d"
+            "sourceHash" : "5d350b0beb2a203083d00ac8ccf4ee31d0e511d0f8980a9ae1f0c5bdf1e66aea"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02f850",
-                    "hash" : "0xe8fbe20ffdbd9bf3a1cfc0292e2a0a983b37c3c6101b14bb24d496613554a490",
-                    "mixHash" : "0xf5edfd291e30f3c9a3260428705df0cbbd53426c2f153f00c848a5fd71f8c6eb",
-                    "nonce" : "0xb2273cc8d690d3b1",
+                    "hash" : "0x94920ed5c04aad58dfa6d6fc41749cf8d72139b62055eb8bd175a2eabcaee01c",
+                    "mixHash" : "0xe69816e8959d9460d7e63a7bd3182fdcc953ad6f6842e06d90b368760de04eb3",
+                    "nonce" : "0xeca8be6459f174ca",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0x22daa4ec618ff9864bc8ce0902c3f553084cec98cc8233f5fba9c0e52cf9bd05",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x66eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0461e2e95714807c0dac8c0874d641c18eb32afbc8e4d8f71c1f2659107e07ab4a066eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68a022daa4ec618ff9864bc8ce0902c3f553084cec98cc8233f5fba9c0e52cf9bd05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f8508203e880a0f5edfd291e30f3c9a3260428705df0cbbd53426c2f153f00c848a5fd71f8c6eb88b2273cc8d690d3b1f90209f9020601018302f85094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca04597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120a00deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273c0",
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0461e2e95714807c0dac8c0874d641c18eb32afbc8e4d8f71c1f2659107e07ab4a066eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68a022daa4ec618ff9864bc8ce0902c3f553084cec98cc8233f5fba9c0e52cf9bd05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f8508203e880a0e69816e8959d9460d7e63a7bd3182fdcc953ad6f6842e06d90b368760de04eb388eca8be6459f174caf90209f9020601018302f85094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca04597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120a00deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8fbe20ffdbd9bf3a1cfc0292e2a0a983b37c3c6101b14bb24d496613554a490",
+        "lastblockhash" : "0x94920ed5c04aad58dfa6d6fc41749cf8d72139b62055eb8bd175a2eabcaee01c",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g1v0.json
index 7a73a41bf..5a82fcb90 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g1v0Filler.json",
+            "sourceHash" : "35fb3861ae183584497ccc8c2dc4dbe815e10cb2b973ec18fc10c0d975a31d4b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x31283b10016b5427255b0d9038f88d82c75d120d3a59146d758bdc2b191f15b3",
+                    "mixHash" : "0x8db96908ce32a5b98c5300d360c93fded86b51d275609686aaf4d7a3ce3c35d1",
+                    "nonce" : "0xda0c1a547e05f57e",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xd8c9749e47005be4a5920a48bbd6d7eb95c1ea84d5352ce2fdc6a707d427bff4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3b033a0ecb8c82946a3c83810f68dc19f36a3b8ddea8c50f8e032da406e30632",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d8c9749e47005be4a5920a48bbd6d7eb95c1ea84d5352ce2fdc6a707d427bff4a03b033a0ecb8c82946a3c83810f68dc19f36a3b8ddea8c50f8e032da406e30632a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a08db96908ce32a5b98c5300d360c93fded86b51d275609686aaf4d7a3ce3c35d188da0c1a547e05f57ef90209f90206010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca05d7791c2c9d618a1614cb09ff8bde0c7573c9632611d609a4b6c88de1e1abdbda037457e745a1506f3092b1b52982c5cd1a86c0f980ef8d3cae4a94bb2c8bd7781c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5d7791c2c9d618a1614cb09ff8bde0c7573c9632611d609a4b6c88de1e1abdbd",
+                        "s" : "0x37457e745a1506f3092b1b52982c5cd1a86c0f980ef8d3cae4a94bb2c8bd7781",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x31283b10016b5427255b0d9038f88d82c75d120d3a59146d758bdc2b191f15b3",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g2v0.json
index 7a73a41bf..c0067e935 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g2v0Filler.json",
+            "sourceHash" : "c71ed8ec1cdf28283bf44fd1d714d6c9d8aa577982c00edb6cbd761779a88dec"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x4e4e636a3303aa723572b75987cefd69145d73dd18bb08f8c3a7d364cd36d6c1",
+                    "mixHash" : "0xaea58de8b79308d51c44a0cc070ef6d83a742fa75fd18073306f245293e67d7e",
+                    "nonce" : "0x8c94b30a26c2c82f",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x21517e54756b572405a588dee774b0ea32e2bd383e196464c7f2e71dbeac7750",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa0e9e440d34b5aac57dabc51502d504acdbf9f919a076e58d263ea8ad8553378",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a021517e54756b572405a588dee774b0ea32e2bd383e196464c7f2e71dbeac7750a0a0e9e440d34b5aac57dabc51502d504acdbf9f919a076e58d263ea8ad8553378a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a0aea58de8b79308d51c44a0cc070ef6d83a742fa75fd18073306f245293e67d7e888c94b30a26c2c82ff90209f9020601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca0bc3b29699392e4dc158ae440a2daa70cbffc28a55bca3ae1adba82ac7c042bb4a057716946d6f82b100a838a36d74ee5977d2603a9b2a2625fb707f2c2c586915dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbc3b29699392e4dc158ae440a2daa70cbffc28a55bca3ae1adba82ac7c042bb4",
+                        "s" : "0x57716946d6f82b100a838a36d74ee5977d2603a9b2a2625fb707f2c2c586915d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4e4e636a3303aa723572b75987cefd69145d73dd18bb08f8c3a7d364cd36d6c1",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g3v0.json
index 7a73a41bf..9f2fb40e5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g3v0Filler.json",
+            "sourceHash" : "41f41daa6c42f350d13cce6ed3c03ced2c319e5537fa139c58b2999d38d9a27f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x35b0ef86e86f2fc9ebbf9d07ee4238538f637bdde05c96d363238739a34cd456",
+                    "mixHash" : "0x4989d91988046a45fc86c853dfc7dd0f76e654c57872aab3cd49aa5ebd409789",
+                    "nonce" : "0x30497cb8093b4560",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x12291eed04feb7fc2da5623b4c888b5801c3331a3b067aeb06f6d8cf62e15881",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x992a54fef1becfc6aefd3b90e3cec6c788da09df3682fb6a1a1db999bfc7973b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a012291eed04feb7fc2da5623b4c888b5801c3331a3b067aeb06f6d8cf62e15881a0992a54fef1becfc6aefd3b90e3cec6c788da09df3682fb6a1a1db999bfc7973ba0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a04989d91988046a45fc86c853dfc7dd0f76e654c57872aab3cd49aa5ebd4097898830497cb8093b4560f90209f90206010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba03d056fcbf5bdc7380d8439f1ebb4ae949af69e60afd9fb420a94bbe1c9a5bf7fa0397f444c125b479b35bfebef978e94a6247810be4b157d019acef1fe1d0115fdc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3d056fcbf5bdc7380d8439f1ebb4ae949af69e60afd9fb420a94bbe1c9a5bf7f",
+                        "s" : "0x397f444c125b479b35bfebef978e94a6247810be4b157d019acef1fe1d0115fd",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x35b0ef86e86f2fc9ebbf9d07ee4238538f637bdde05c96d363238739a34cd456",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0.json
index 54ea5cd56..b473ab510 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_0_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0Filler.json",
-            "sourceHash" : "3883d8e6a8e2450f73ec2ab33ebef3de08df89a945321d540a1484c47cf8f03c"
+            "sourceHash" : "2593f4fed98a99f71b90b4860028adfbdd1715ecc5a9782e5f9eb771f3d909a0"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xeaec",
-                    "hash" : "0x23673d52bbbe8f0bf693f5efd133b04f78bf9c5f8ba90f2c528b359edadf0f6a",
-                    "mixHash" : "0x7c937b9257fa238170e4fae428f3b414686a21ce589fb8c33031adeea3a48027",
-                    "nonce" : "0x4980706786835f92",
+                    "hash" : "0xa00a13e2c20c1ffbb7b4a2175445ac3dbaf90fe8ad60bc1afad6da341885f30c",
+                    "mixHash" : "0xcd0ab058715b37c7218754ccf88a964011d957cbc2fa01104826b0d1f5a56c3c",
+                    "nonce" : "0x54fbde83be40e1e9",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0xe9ca9d9ab4a96d3a27ed3547aba39e8de65e74ac39fad7fa811b675378364645",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x6e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a048a59d5f62b4bb13d074bca85926e3057cffce9d3c78174256b85ca4c245206ba06e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ada0e9ca9d9ab4a96d3a27ed3547aba39e8de65e74ac39fad7fa811b675378364645b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082eaec8203e880a07c937b9257fa238170e4fae428f3b414686a21ce589fb8c33031adeea3a48027884980706786835f92f90208f90205010182eaec94c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca08b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932a05fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823c0",
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a048a59d5f62b4bb13d074bca85926e3057cffce9d3c78174256b85ca4c245206ba06e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ada0e9ca9d9ab4a96d3a27ed3547aba39e8de65e74ac39fad7fa811b675378364645b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082eaec8203e880a0cd0ab058715b37c7218754ccf88a964011d957cbc2fa01104826b0d1f5a56c3c8854fbde83be40e1e9f90208f90205010182eaec94c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca08b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932a05fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x23673d52bbbe8f0bf693f5efd133b04f78bf9c5f8ba90f2c528b359edadf0f6a",
+        "lastblockhash" : "0xa00a13e2c20c1ffbb7b4a2175445ac3dbaf90fe8ad60bc1afad6da341885f30c",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g1v0.json
index 7a73a41bf..25119117b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g1v0Filler.json",
+            "sourceHash" : "0a3b6b443f879d64c9f55f925600e38aa2fda98376b413918666ad06c7f0661b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0xbdb48343b6173624caf85f0a1116437ee9464e5fd19f5e66b8792571bb6eb8e5",
+                    "mixHash" : "0xab9ded618a17f4a4f5937f5f2db6aae13f484eda25b258f1429c67c3e04a2f3a",
+                    "nonce" : "0xca026c91027f2f60",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xd8c9749e47005be4a5920a48bbd6d7eb95c1ea84d5352ce2fdc6a707d427bff4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3b033a0ecb8c82946a3c83810f68dc19f36a3b8ddea8c50f8e032da406e30632",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d8c9749e47005be4a5920a48bbd6d7eb95c1ea84d5352ce2fdc6a707d427bff4a03b033a0ecb8c82946a3c83810f68dc19f36a3b8ddea8c50f8e032da406e30632a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0ab9ded618a17f4a4f5937f5f2db6aae13f484eda25b258f1429c67c3e04a2f3a88ca026c91027f2f60f90209f90206010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca05d7791c2c9d618a1614cb09ff8bde0c7573c9632611d609a4b6c88de1e1abdbda037457e745a1506f3092b1b52982c5cd1a86c0f980ef8d3cae4a94bb2c8bd7781c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5d7791c2c9d618a1614cb09ff8bde0c7573c9632611d609a4b6c88de1e1abdbd",
+                        "s" : "0x37457e745a1506f3092b1b52982c5cd1a86c0f980ef8d3cae4a94bb2c8bd7781",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbdb48343b6173624caf85f0a1116437ee9464e5fd19f5e66b8792571bb6eb8e5",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g2v0.json
index 7a73a41bf..a41f632e3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g2v0Filler.json",
+            "sourceHash" : "9e874f9e1e81c3ad854fc3fa01c3c8a975b95956231c3a9494442f96617af509"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x3d1bf70a71a85c05f68632bc92b61d44de13386949d943165bd41322cb9604e0",
+                    "mixHash" : "0x9045b924f88e3c23e46d75be8638b3a214e8236533bcfee4675d3fe58c610289",
+                    "nonce" : "0xed52332846450496",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x21517e54756b572405a588dee774b0ea32e2bd383e196464c7f2e71dbeac7750",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa0e9e440d34b5aac57dabc51502d504acdbf9f919a076e58d263ea8ad8553378",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a021517e54756b572405a588dee774b0ea32e2bd383e196464c7f2e71dbeac7750a0a0e9e440d34b5aac57dabc51502d504acdbf9f919a076e58d263ea8ad8553378a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a09045b924f88e3c23e46d75be8638b3a214e8236533bcfee4675d3fe58c61028988ed52332846450496f90209f9020601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca0bc3b29699392e4dc158ae440a2daa70cbffc28a55bca3ae1adba82ac7c042bb4a057716946d6f82b100a838a36d74ee5977d2603a9b2a2625fb707f2c2c586915dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbc3b29699392e4dc158ae440a2daa70cbffc28a55bca3ae1adba82ac7c042bb4",
+                        "s" : "0x57716946d6f82b100a838a36d74ee5977d2603a9b2a2625fb707f2c2c586915d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3d1bf70a71a85c05f68632bc92b61d44de13386949d943165bd41322cb9604e0",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g3v0.json
index 7a73a41bf..1df0c1921 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g3v0Filler.json",
+            "sourceHash" : "781110ba7482df24d81b7739afd6ebe364e30f109a914629ffae15a3f4b72a9f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x73466cb2187fd976dec0eec07b29be6b97d00109f963745d8f99a579f162de42",
+                    "mixHash" : "0x21f09329542ef56759cf23292d8778858727aa8a4c60ee9aa6af14ed44cfaa35",
+                    "nonce" : "0xdbc32ea539a9e645",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x12291eed04feb7fc2da5623b4c888b5801c3331a3b067aeb06f6d8cf62e15881",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x992a54fef1becfc6aefd3b90e3cec6c788da09df3682fb6a1a1db999bfc7973b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a012291eed04feb7fc2da5623b4c888b5801c3331a3b067aeb06f6d8cf62e15881a0992a54fef1becfc6aefd3b90e3cec6c788da09df3682fb6a1a1db999bfc7973ba0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a021f09329542ef56759cf23292d8778858727aa8a4c60ee9aa6af14ed44cfaa3588dbc32ea539a9e645f90209f90206010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba03d056fcbf5bdc7380d8439f1ebb4ae949af69e60afd9fb420a94bbe1c9a5bf7fa0397f444c125b479b35bfebef978e94a6247810be4b157d019acef1fe1d0115fdc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3d056fcbf5bdc7380d8439f1ebb4ae949af69e60afd9fb420a94bbe1c9a5bf7f",
+                        "s" : "0x397f444c125b479b35bfebef978e94a6247810be4b157d019acef1fe1d0115fd",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x73466cb2187fd976dec0eec07b29be6b97d00109f963745d8f99a579f162de42",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0.json
index 7e5c535a9..a3311d7c3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_0_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0Filler.json",
-            "sourceHash" : "3134df793885a75090ad6321dec7a79371adb8f49f47b5846da23e62e79e6ad1"
+            "sourceHash" : "c83ecbd4c25528f7c920485d50abe681e7a7756e06e5b6f54b7ab76aef819de6"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf0c8",
-                    "hash" : "0x8517bdee0c8b5d1a229debf270baa964ae61ba58571ac2c611b82527bfe6162a",
-                    "mixHash" : "0x8564fe65cc789434e5535576b43e2ebaa6b66b42d0a155c306ba0bb065a0f045",
-                    "nonce" : "0x35b6abba61e9c402",
+                    "hash" : "0xcc0fda7dbcf2d6e4d4c129627dcd6fff17d0c5285354d4489b7539338fb53210",
+                    "mixHash" : "0x6398ea6b6873f84b01a5cda61142465707798e2269774c212fb49ea8f7248965",
+                    "nonce" : "0x487e0f9f495c120e",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0xe85b100edfce258e1d30c911df1270d1a697d3013fa78cac93481858c4588141",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xe2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90406f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e01fb00540e6e4505a68b7cce0fd356fa3ae4054579a114a4640a583889912dca0e2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457a0e85b100edfce258e1d30c911df1270d1a697d3013fa78cac93481858c4588141b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f0c88203e880a08564fe65cc789434e5535576b43e2ebaa6b66b42d0a155c306ba0bb065a0f0458835b6abba61e9c402f90207f90204010182f0c894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971c9f6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63a020a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99c0",
+                "rlp" : "0xf90406f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e01fb00540e6e4505a68b7cce0fd356fa3ae4054579a114a4640a583889912dca0e2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457a0e85b100edfce258e1d30c911df1270d1a697d3013fa78cac93481858c4588141b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f0c88203e880a06398ea6b6873f84b01a5cda61142465707798e2269774c212fb49ea8f724896588487e0f9f495c120ef90207f90204010182f0c894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971c9f6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63a020a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8517bdee0c8b5d1a229debf270baa964ae61ba58571ac2c611b82527bfe6162a",
+        "lastblockhash" : "0xcc0fda7dbcf2d6e4d4c129627dcd6fff17d0c5285354d4489b7539338fb53210",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g1v0.json
index 7a73a41bf..612e385e0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g1v0Filler.json",
+            "sourceHash" : "5934e874785d07d1515a581a4fa06beb1dc27e2ab086f5727008bbcfd1f099f8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x609a02bb471a01bb7445c1b8d09b641f194df3ecd4c111ab608b3a07c2e25013",
+                    "mixHash" : "0x2ad52e5c3aefb466245b5580b630fb2e49d20064a9cf457e5d319d251e898895",
+                    "nonce" : "0x601e597468090de8",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xd8c9749e47005be4a5920a48bbd6d7eb95c1ea84d5352ce2fdc6a707d427bff4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3b033a0ecb8c82946a3c83810f68dc19f36a3b8ddea8c50f8e032da406e30632",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d8c9749e47005be4a5920a48bbd6d7eb95c1ea84d5352ce2fdc6a707d427bff4a03b033a0ecb8c82946a3c83810f68dc19f36a3b8ddea8c50f8e032da406e30632a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a02ad52e5c3aefb466245b5580b630fb2e49d20064a9cf457e5d319d251e89889588601e597468090de8f90209f90206010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca05d7791c2c9d618a1614cb09ff8bde0c7573c9632611d609a4b6c88de1e1abdbda037457e745a1506f3092b1b52982c5cd1a86c0f980ef8d3cae4a94bb2c8bd7781c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5d7791c2c9d618a1614cb09ff8bde0c7573c9632611d609a4b6c88de1e1abdbd",
+                        "s" : "0x37457e745a1506f3092b1b52982c5cd1a86c0f980ef8d3cae4a94bb2c8bd7781",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x609a02bb471a01bb7445c1b8d09b641f194df3ecd4c111ab608b3a07c2e25013",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g2v0.json
index 7a73a41bf..c8ab5350c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g2v0Filler.json",
+            "sourceHash" : "5ceca8887cc97ee092e5f1ee71b470a78742af8df1d30285a74ac917baf344ab"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0xa809e8f2d3093ecc37333114104036e4bfc5f9f910c7ed6d89a8f970c0cbfe2c",
+                    "mixHash" : "0x8cc63f9aa55dfa4cd4369e3bbe509561cd310812741ed96b336c8b06dfedb050",
+                    "nonce" : "0xddbdb8eb3507d4d5",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x21517e54756b572405a588dee774b0ea32e2bd383e196464c7f2e71dbeac7750",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa0e9e440d34b5aac57dabc51502d504acdbf9f919a076e58d263ea8ad8553378",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a021517e54756b572405a588dee774b0ea32e2bd383e196464c7f2e71dbeac7750a0a0e9e440d34b5aac57dabc51502d504acdbf9f919a076e58d263ea8ad8553378a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a08cc63f9aa55dfa4cd4369e3bbe509561cd310812741ed96b336c8b06dfedb05088ddbdb8eb3507d4d5f90209f9020601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca0bc3b29699392e4dc158ae440a2daa70cbffc28a55bca3ae1adba82ac7c042bb4a057716946d6f82b100a838a36d74ee5977d2603a9b2a2625fb707f2c2c586915dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbc3b29699392e4dc158ae440a2daa70cbffc28a55bca3ae1adba82ac7c042bb4",
+                        "s" : "0x57716946d6f82b100a838a36d74ee5977d2603a9b2a2625fb707f2c2c586915d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa809e8f2d3093ecc37333114104036e4bfc5f9f910c7ed6d89a8f970c0cbfe2c",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g3v0.json
index 7a73a41bf..bd3cc0bfd 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g3v0Filler.json",
+            "sourceHash" : "f57e51387c1520a712a57e209d628c87678e21a681380c53e98d184a579ce6d4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x7664e045e287329315590f5c62bbdfb56a0f880b3f2e5fddc3b8d258890f04a8",
+                    "mixHash" : "0xccf7a3b06d7dcc90349a3bba626d7fb7cf408dc0ebba9dcd7c595e79a38e51a6",
+                    "nonce" : "0x5fe8b33b2af07ff1",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x12291eed04feb7fc2da5623b4c888b5801c3331a3b067aeb06f6d8cf62e15881",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x992a54fef1becfc6aefd3b90e3cec6c788da09df3682fb6a1a1db999bfc7973b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a012291eed04feb7fc2da5623b4c888b5801c3331a3b067aeb06f6d8cf62e15881a0992a54fef1becfc6aefd3b90e3cec6c788da09df3682fb6a1a1db999bfc7973ba0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0ccf7a3b06d7dcc90349a3bba626d7fb7cf408dc0ebba9dcd7c595e79a38e51a6885fe8b33b2af07ff1f90209f90206010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba03d056fcbf5bdc7380d8439f1ebb4ae949af69e60afd9fb420a94bbe1c9a5bf7fa0397f444c125b479b35bfebef978e94a6247810be4b157d019acef1fe1d0115fdc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3d056fcbf5bdc7380d8439f1ebb4ae949af69e60afd9fb420a94bbe1c9a5bf7f",
+                        "s" : "0x397f444c125b479b35bfebef978e94a6247810be4b157d019acef1fe1d0115fd",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7664e045e287329315590f5c62bbdfb56a0f880b3f2e5fddc3b8d258890f04a8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0.json
index 6e83f82fe..f9317aa2b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_0_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0Filler.json",
-            "sourceHash" : "9da9cbf5dae3ea5c6e66865535cddd5d7f6303d5a17a534595fe62cca28bf61c"
+            "sourceHash" : "396b440a11b3983d3bcdd1df6aef7217fc00172e8a45b37730b5141cf3d1855d"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xfc80",
-                    "hash" : "0xc375bdb1e60828024b9360d84b4e57676a7d6be9641907946646edfdfa509a6d",
-                    "mixHash" : "0x8e75451c3443d092a0f621af902dd549e26aee9473460eecc119c2bde5ebbb50",
-                    "nonce" : "0xbd7f40950bc5488e",
+                    "hash" : "0xd50cbd2b47d9356eea871b4f7c32813f52deb336c4c347ed0ccabe11df69f5e6",
+                    "mixHash" : "0x82e674be7a50aa6b5e0c0f019202ebaff4d62e784b030a34b67d17cadc6c9473",
+                    "nonce" : "0x15cf5a6eec92b2a4",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0xc3d0ee8e00eda3cfad32dfa3158e348d8d099d4ddd233605da645fcd4dbe2149",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xdd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06d076ba29b9b9309ceb4b2b3aca1a93bf9d20dbd1af66989391ce8caf9707e49a0dd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042a0c3d0ee8e00eda3cfad32dfa3158e348d8d099d4ddd233605da645fcd4dbe2149b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fc808203e880a08e75451c3443d092a0f621af902dd549e26aee9473460eecc119c2bde5ebbb5088bd7f40950bc5488ef90208f90205010182fc8094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0aeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aeaa04ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615ac0",
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06d076ba29b9b9309ceb4b2b3aca1a93bf9d20dbd1af66989391ce8caf9707e49a0dd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042a0c3d0ee8e00eda3cfad32dfa3158e348d8d099d4ddd233605da645fcd4dbe2149b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fc808203e880a082e674be7a50aa6b5e0c0f019202ebaff4d62e784b030a34b67d17cadc6c94738815cf5a6eec92b2a4f90208f90205010182fc8094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0aeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aeaa04ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc375bdb1e60828024b9360d84b4e57676a7d6be9641907946646edfdfa509a6d",
+        "lastblockhash" : "0xd50cbd2b47d9356eea871b4f7c32813f52deb336c4c347ed0ccabe11df69f5e6",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g1v0.json
index 7a73a41bf..b23fe4a07 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g1v0Filler.json",
+            "sourceHash" : "a83b02d11e130763349329f33e6c3ab2401bd4d1fe1f817bc1f4528c352b4701"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x5dae05f6c62bedf8fe8102cf3872090065fe385742d29270d7bc6e5300226488",
+                    "mixHash" : "0x193abd0b5bea9939f86f5a474a5ef406b79eddbfd7aa9634e5f3462bb8a97a90",
+                    "nonce" : "0x88b81f1c7b772176",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xd8c9749e47005be4a5920a48bbd6d7eb95c1ea84d5352ce2fdc6a707d427bff4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3b033a0ecb8c82946a3c83810f68dc19f36a3b8ddea8c50f8e032da406e30632",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d8c9749e47005be4a5920a48bbd6d7eb95c1ea84d5352ce2fdc6a707d427bff4a03b033a0ecb8c82946a3c83810f68dc19f36a3b8ddea8c50f8e032da406e30632a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0193abd0b5bea9939f86f5a474a5ef406b79eddbfd7aa9634e5f3462bb8a97a908888b81f1c7b772176f90209f90206010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca05d7791c2c9d618a1614cb09ff8bde0c7573c9632611d609a4b6c88de1e1abdbda037457e745a1506f3092b1b52982c5cd1a86c0f980ef8d3cae4a94bb2c8bd7781c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5d7791c2c9d618a1614cb09ff8bde0c7573c9632611d609a4b6c88de1e1abdbd",
+                        "s" : "0x37457e745a1506f3092b1b52982c5cd1a86c0f980ef8d3cae4a94bb2c8bd7781",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5dae05f6c62bedf8fe8102cf3872090065fe385742d29270d7bc6e5300226488",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g2v0.json
index 7a73a41bf..ed733a4be 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g2v0Filler.json",
+            "sourceHash" : "acac00e96af0a39a05ee8ea6b824485140571d203bc2aa60bb9e1d066934715b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x6e655b3d1aaa9ac2699ee77c488a16ba95483bd14e3768e78916d9decce28c83",
+                    "mixHash" : "0x614a160c461aa813a6f7fdb79029fd13029058e5d36a9e5cc3d7e76e7d6d767c",
+                    "nonce" : "0xefbb174c7900b632",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x21517e54756b572405a588dee774b0ea32e2bd383e196464c7f2e71dbeac7750",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa0e9e440d34b5aac57dabc51502d504acdbf9f919a076e58d263ea8ad8553378",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a021517e54756b572405a588dee774b0ea32e2bd383e196464c7f2e71dbeac7750a0a0e9e440d34b5aac57dabc51502d504acdbf9f919a076e58d263ea8ad8553378a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a0614a160c461aa813a6f7fdb79029fd13029058e5d36a9e5cc3d7e76e7d6d767c88efbb174c7900b632f90209f9020601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca0bc3b29699392e4dc158ae440a2daa70cbffc28a55bca3ae1adba82ac7c042bb4a057716946d6f82b100a838a36d74ee5977d2603a9b2a2625fb707f2c2c586915dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbc3b29699392e4dc158ae440a2daa70cbffc28a55bca3ae1adba82ac7c042bb4",
+                        "s" : "0x57716946d6f82b100a838a36d74ee5977d2603a9b2a2625fb707f2c2c586915d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6e655b3d1aaa9ac2699ee77c488a16ba95483bd14e3768e78916d9decce28c83",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g3v0.json
index 7a73a41bf..4fe8e5332 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g3v0Filler.json",
+            "sourceHash" : "6a819fc1c9ab7fa9dc2fa4b411271a6810a21300184e800e5f04242653794398"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x040048cb59b19a7826135064082dcb08caa26fc5fc05a8cdc4c8fef3739079de",
+                    "mixHash" : "0x076075f824fc600851da8a2ef6ac477e1a8b4626b59c3233ab2c892ee552b77a",
+                    "nonce" : "0x5f7d2e0577b8e60f",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x12291eed04feb7fc2da5623b4c888b5801c3331a3b067aeb06f6d8cf62e15881",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x992a54fef1becfc6aefd3b90e3cec6c788da09df3682fb6a1a1db999bfc7973b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a012291eed04feb7fc2da5623b4c888b5801c3331a3b067aeb06f6d8cf62e15881a0992a54fef1becfc6aefd3b90e3cec6c788da09df3682fb6a1a1db999bfc7973ba0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0076075f824fc600851da8a2ef6ac477e1a8b4626b59c3233ab2c892ee552b77a885f7d2e0577b8e60ff90209f90206010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba03d056fcbf5bdc7380d8439f1ebb4ae949af69e60afd9fb420a94bbe1c9a5bf7fa0397f444c125b479b35bfebef978e94a6247810be4b157d019acef1fe1d0115fdc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3d056fcbf5bdc7380d8439f1ebb4ae949af69e60afd9fb420a94bbe1c9a5bf7f",
+                        "s" : "0x397f444c125b479b35bfebef978e94a6247810be4b157d019acef1fe1d0115fd",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x040048cb59b19a7826135064082dcb08caa26fc5fc05a8cdc4c8fef3739079de",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0.json
index 47b18647e..66b66a59b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_0_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0Filler.json",
-            "sourceHash" : "eacb0935897fcc3149c49f0ef60a0098b1902f9888cbd495de3d0de6cea43b92"
+            "sourceHash" : "efc6e6db859f267a2d0cd3d8bf189a8911f25e91b3cb8f62cb61c0dd54416bda"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x012390",
-                    "hash" : "0x3e7dc785266c604aee000894bbadbea2b268cf9e35f49e02b6615bb845ebc801",
-                    "mixHash" : "0x13e4ded04fac10083c8d98e68030c0b1689cb9f6e7f6a0aa2256f2c9917a85c0",
-                    "nonce" : "0x7122d8b52422632d",
+                    "hash" : "0x9f5f96e9602f18c841c17280deeec58bcdbd4f649d08b16751adeb3c90ec3beb",
+                    "mixHash" : "0x6ba100ec3da898f7c2a5dafbafc957f1d98f97f589109f02a1e88b1b8efe3116",
+                    "nonce" : "0x6d295bf3f848d79e",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0xd9fa476cad77e03500652d7f1baee89bb384f256ecbdfc5b10b92317de37bb29",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xf6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04e2c84b26c34e8118d8d9dd4d59b863b7742abd9c07ff448a981936d734b7d7ba0f6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35fa0d9fa476cad77e03500652d7f1baee89bb384f256ecbdfc5b10b92317de37bb29b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830123908203e880a013e4ded04fac10083c8d98e68030c0b1689cb9f6e7f6a0aa2256f2c9917a85c0887122d8b52422632df90209f9020601018301239094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca034020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098a007d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72c0",
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04e2c84b26c34e8118d8d9dd4d59b863b7742abd9c07ff448a981936d734b7d7ba0f6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35fa0d9fa476cad77e03500652d7f1baee89bb384f256ecbdfc5b10b92317de37bb29b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830123908203e880a06ba100ec3da898f7c2a5dafbafc957f1d98f97f589109f02a1e88b1b8efe3116886d295bf3f848d79ef90209f9020601018301239094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca034020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098a007d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e7dc785266c604aee000894bbadbea2b268cf9e35f49e02b6615bb845ebc801",
+        "lastblockhash" : "0x9f5f96e9602f18c841c17280deeec58bcdbd4f649d08b16751adeb3c90ec3beb",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g1v0.json
index 7a73a41bf..c479008f2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g1v0Filler.json",
+            "sourceHash" : "b45a2c834158ace8f343d5897bedcf50b1b92cff4af94ac9c66f2a130d44cd42"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x19cb4a596985ce69e285d0fbf38207e20e40054b1704da90b947e7d329519b65",
+                    "mixHash" : "0xb0e2f6621fee23bbff3c0b2225c0d76b4c483e2b859816891e8d70506e473e51",
+                    "nonce" : "0x9a7f9cb77fa4bd63",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xd8c9749e47005be4a5920a48bbd6d7eb95c1ea84d5352ce2fdc6a707d427bff4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3b033a0ecb8c82946a3c83810f68dc19f36a3b8ddea8c50f8e032da406e30632",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d8c9749e47005be4a5920a48bbd6d7eb95c1ea84d5352ce2fdc6a707d427bff4a03b033a0ecb8c82946a3c83810f68dc19f36a3b8ddea8c50f8e032da406e30632a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0b0e2f6621fee23bbff3c0b2225c0d76b4c483e2b859816891e8d70506e473e51889a7f9cb77fa4bd63f90209f90206010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca05d7791c2c9d618a1614cb09ff8bde0c7573c9632611d609a4b6c88de1e1abdbda037457e745a1506f3092b1b52982c5cd1a86c0f980ef8d3cae4a94bb2c8bd7781c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5d7791c2c9d618a1614cb09ff8bde0c7573c9632611d609a4b6c88de1e1abdbd",
+                        "s" : "0x37457e745a1506f3092b1b52982c5cd1a86c0f980ef8d3cae4a94bb2c8bd7781",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x19cb4a596985ce69e285d0fbf38207e20e40054b1704da90b947e7d329519b65",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g2v0.json
index 7a73a41bf..48370f572 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g2v0Filler.json",
+            "sourceHash" : "b6a36b7da3d1e4868c22e192277e4c8bb36f5aa294e078d057adfe8361899e55"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x350a1b46126c33af22ceabdb9d25a3e529dc586905b09ef8d3c72be305ae5af8",
+                    "mixHash" : "0x13d00285010e4ac3cc9dc0eaa4262c6f2e3c4b2a8bdef62c61e375ae2c213eee",
+                    "nonce" : "0xf8777ee04ac70e8a",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x21517e54756b572405a588dee774b0ea32e2bd383e196464c7f2e71dbeac7750",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa0e9e440d34b5aac57dabc51502d504acdbf9f919a076e58d263ea8ad8553378",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a021517e54756b572405a588dee774b0ea32e2bd383e196464c7f2e71dbeac7750a0a0e9e440d34b5aac57dabc51502d504acdbf9f919a076e58d263ea8ad8553378a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a013d00285010e4ac3cc9dc0eaa4262c6f2e3c4b2a8bdef62c61e375ae2c213eee88f8777ee04ac70e8af90209f9020601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca0bc3b29699392e4dc158ae440a2daa70cbffc28a55bca3ae1adba82ac7c042bb4a057716946d6f82b100a838a36d74ee5977d2603a9b2a2625fb707f2c2c586915dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbc3b29699392e4dc158ae440a2daa70cbffc28a55bca3ae1adba82ac7c042bb4",
+                        "s" : "0x57716946d6f82b100a838a36d74ee5977d2603a9b2a2625fb707f2c2c586915d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x350a1b46126c33af22ceabdb9d25a3e529dc586905b09ef8d3c72be305ae5af8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g3v0.json
index 7a73a41bf..855474c67 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_0_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g3v0Filler.json",
+            "sourceHash" : "d94a2281ed9ea318b9373ade4c04c932f65b4318e55b9a12ea7d0bf5235d254a"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x2b7aa29a3255f01cbb480d8fd49c5ce3138c6c33f27b1648ed1bff95eb95335d",
+                    "mixHash" : "0x8d34ef894b8da70af4112aced4b8a4407171dbc7f8296d35b6004e1f13051648",
+                    "nonce" : "0x7a0e41e3ac2673cf",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x12291eed04feb7fc2da5623b4c888b5801c3331a3b067aeb06f6d8cf62e15881",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x992a54fef1becfc6aefd3b90e3cec6c788da09df3682fb6a1a1db999bfc7973b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a012291eed04feb7fc2da5623b4c888b5801c3331a3b067aeb06f6d8cf62e15881a0992a54fef1becfc6aefd3b90e3cec6c788da09df3682fb6a1a1db999bfc7973ba0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a08d34ef894b8da70af4112aced4b8a4407171dbc7f8296d35b6004e1f13051648887a0e41e3ac2673cff90209f90206010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba03d056fcbf5bdc7380d8439f1ebb4ae949af69e60afd9fb420a94bbe1c9a5bf7fa0397f444c125b479b35bfebef978e94a6247810be4b157d019acef1fe1d0115fdc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3d056fcbf5bdc7380d8439f1ebb4ae949af69e60afd9fb420a94bbe1c9a5bf7f",
+                        "s" : "0x397f444c125b479b35bfebef978e94a6247810be4b157d019acef1fe1d0115fd",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2b7aa29a3255f01cbb480d8fd49c5ce3138c6c33f27b1648ed1bff95eb95335d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0.json
index 46476439c..80d0647fb 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_37120_37111_1_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0Filler.json",
             "sourceHash" : "69c5936563237eea50f19d34b6ce1e1d8423b03fdb8e533f4cfd41588ab27efe"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0b554e",
-                    "hash" : "0xacbf48cfb784f32db86980603cb98759bec265a6452d110ee1481a64cf1df456",
-                    "mixHash" : "0x67b076cec886c0c5f72e553646bfad49c00c0de4b3c84e3b232336823f527e8e",
-                    "nonce" : "0x38cb92e1625b9d0d",
+                    "hash" : "0x6fe9a41c2aa1d0325a07292375724397be0e71a6b11f276d7047c6f5a6aa1938",
+                    "mixHash" : "0x41e4afb1d44d424f9fb53e320e9ad48891e62659dfcf2c7349f46d761eb28023",
+                    "nonce" : "0xfe08d7227dee1612",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x3556590d36a868cddabadffce132c5d68e4b501b3d658614aaa85ca7c783c5a7",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x04a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d3883aef6ab4ee1a2480afbb9c534743c142f24c28f8384c84bb74d7009cd18da004a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0a03556590d36a868cddabadffce132c5d68e4b501b3d658614aaa85ca7c783c5a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830b554e8203e880a067b076cec886c0c5f72e553646bfad49c00c0de4b3c84e3b232336823f527e8e8838cb92e1625b9d0df90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdba00c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5c0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d3883aef6ab4ee1a2480afbb9c534743c142f24c28f8384c84bb74d7009cd18da004a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0a03556590d36a868cddabadffce132c5d68e4b501b3d658614aaa85ca7c783c5a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830b554e8203e880a041e4afb1d44d424f9fb53e320e9ad48891e62659dfcf2c7349f46d761eb2802388fe08d7227dee1612f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdba00c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xacbf48cfb784f32db86980603cb98759bec265a6452d110ee1481a64cf1df456",
+        "lastblockhash" : "0x6fe9a41c2aa1d0325a07292375724397be0e71a6b11f276d7047c6f5a6aa1938",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g1v0.json
index 7a73a41bf..f330f4d63 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g1v0Filler.json",
+            "sourceHash" : "2d71dfe6fb4e8e2da14bc3ec51934830d1363cc9432e7cbb1a021de45c905b1b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x3af08b36e3260b6d0c88bfdd3c77e05215a9f62be0e29ccad84b7499eae9fd7e",
+                    "mixHash" : "0xfc40898a85bbec4f892c3eee43097cd1c1742e0908c1236b4bd1c34ee28e2bd9",
+                    "nonce" : "0x672e569a330bf14e",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xfcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9e551e19bcf325eb42d6e04a7ea19e1428f082a68645c68197c4dd62b6fab22d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2ea09e551e19bcf325eb42d6e04a7ea19e1428f082a68645c68197c4dd62b6fab22da022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0fc40898a85bbec4f892c3eee43097cd1c1742e0908c1236b4bd1c34ee28e2bd988672e569a330bf14ef90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba02c589cfead49893491fbe5d82a33402c366c905d77f160a5f01b2c08aa73b2c0a049202fc3f90d64bdfcdca492e1c4c294239e24244769d0296c9b7dba21eb9b7bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2c589cfead49893491fbe5d82a33402c366c905d77f160a5f01b2c08aa73b2c0",
+                        "s" : "0x49202fc3f90d64bdfcdca492e1c4c294239e24244769d0296c9b7dba21eb9b7b",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3af08b36e3260b6d0c88bfdd3c77e05215a9f62be0e29ccad84b7499eae9fd7e",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g2v0.json
index 7a73a41bf..9b7af1354 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g2v0Filler.json",
+            "sourceHash" : "4f2657b78fc43a36678404b0e0f90402b4e72b5a28577d7e623f605249d75b49"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x9f130deedf9c35c46c0eeb229c85cbb45b1fe11e183de244d0a8408cbd81d53a",
+                    "mixHash" : "0x9b7e66bccf086e3480000161943868a7748dfbaa30d95a859c919a5d8ae21487",
+                    "nonce" : "0x76eb9688df7d5c23",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xa658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0eeb6cc1ffe72b2a93964cc523f66629ed72bf1021f589279a11118cab2f99b0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819a00eeb6cc1ffe72b2a93964cc523f66629ed72bf1021f589279a11118cab2f99b0a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a09b7e66bccf086e3480000161943868a7748dfbaa30d95a859c919a5d8ae214878876eb9688df7d5c23f90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba03d02bf4e787e1ea6225ff3c295e1d2c680489bbcbe88908aab279c15e136bdc1a04aa72430be82743a7c35c41e69a957e51e7ffbfd35edaff76257ed9f454955b9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3d02bf4e787e1ea6225ff3c295e1d2c680489bbcbe88908aab279c15e136bdc1",
+                        "s" : "0x4aa72430be82743a7c35c41e69a957e51e7ffbfd35edaff76257ed9f454955b9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9f130deedf9c35c46c0eeb229c85cbb45b1fe11e183de244d0a8408cbd81d53a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g3v0.json
index 7a73a41bf..756732eaa 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g3v0Filler.json",
+            "sourceHash" : "d5c9ad6e9e41ebdf68da34b4f0cd5eb14cd45ca5d1b5e459f835d228e7853503"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x0f23f2e239a7edaf23c8167ad13eb678b5e8042e0052fd524cda63dff56d6870",
+                    "mixHash" : "0x513f3defd224a3fefcfdc616e7ebedf5da6d024dd817178cc87b61c3e5024b3b",
+                    "nonce" : "0x742cf45b6fd293ea",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0xadd3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x664f9aba117024b86e246325a0b7bbf5c0ca42bb578a6e267da15a0ae04587d9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0add3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50a0664f9aba117024b86e246325a0b7bbf5c0ca42bb578a6e267da15a0ae04587d9a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0513f3defd224a3fefcfdc616e7ebedf5da6d024dd817178cc87b61c3e5024b3b88742cf45b6fd293eaf90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0e8d93ad1bd1e9cfe4d4ed987c7599dd2fc5e8fa15d71ac7ed4c472920d31e2fba05faa6f1e0bfda79a5e46d8f35ca83e8ee80ceb48513f4894763f0faa25629bf8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xe8d93ad1bd1e9cfe4d4ed987c7599dd2fc5e8fa15d71ac7ed4c472920d31e2fb",
+                        "s" : "0x5faa6f1e0bfda79a5e46d8f35ca83e8ee80ceb48513f4894763f0faa25629bf8",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0f23f2e239a7edaf23c8167ad13eb678b5e8042e0052fd524cda63dff56d6870",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0.json
index 1a33ad5d0..9946a01ce 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_1_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0Filler.json",
-            "sourceHash" : "bbf7aa07b919a75c2158aa7acf44f06163b3a7475f07485e3745ef187de9d95e"
+            "sourceHash" : "de6198eace87d7cd9a2e0e0bb1fc1d6fdaffcd567160102e4069bf29a904c420"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02f950",
-                    "hash" : "0xd23446dd190d1dedc56d3fb6bf35b0a731fdd7ca44c36406bfafd043536b93f3",
-                    "mixHash" : "0x3635436724d7fd912fd140d453e1f199334d7c90cd0a4e546479cefa2c3085a7",
-                    "nonce" : "0x109857e958d6b275",
+                    "hash" : "0x78261daaba8f91f0405a9cd1fe1089b1d94b4433f513d53e363535647b76b77f",
+                    "mixHash" : "0x2151724bc6ab8ea9816580e3481bac1972100d6fe623ea2d0b36611fe3015738",
+                    "nonce" : "0x4231098f59c9ee21",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x39569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x0dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f5debea0cd97c5977c8a6ef287c446e551c3a50dc9c10ba4a948a76796ac8cfda00dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97a039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a03635436724d7fd912fd140d453e1f199334d7c90cd0a4e546479cefa2c3085a788109857e958d6b275f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9a05e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3cc0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f5debea0cd97c5977c8a6ef287c446e551c3a50dc9c10ba4a948a76796ac8cfda00dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97a039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a02151724bc6ab8ea9816580e3481bac1972100d6fe623ea2d0b36611fe3015738884231098f59c9ee21f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9a05e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd23446dd190d1dedc56d3fb6bf35b0a731fdd7ca44c36406bfafd043536b93f3",
+        "lastblockhash" : "0x78261daaba8f91f0405a9cd1fe1089b1d94b4433f513d53e363535647b76b77f",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g1v0.json
index 7a73a41bf..7a654094d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g1v0Filler.json",
+            "sourceHash" : "dfa67b160c2644ab32d7b0758414d490752e60b5121a9c4f7f8d263d6f345557"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x3c8cdf1e0bd555b37e66533d7a52cea72e06f08b28b1ac37256ee397f28b5b46",
+                    "mixHash" : "0xfaf90dce258391323c37b6af8ac5a3de1bc79d6595005286b983b89d469641a6",
+                    "nonce" : "0x2dbe949c7626ee09",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xfcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9e551e19bcf325eb42d6e04a7ea19e1428f082a68645c68197c4dd62b6fab22d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2ea09e551e19bcf325eb42d6e04a7ea19e1428f082a68645c68197c4dd62b6fab22da022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0faf90dce258391323c37b6af8ac5a3de1bc79d6595005286b983b89d469641a6882dbe949c7626ee09f90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba02c589cfead49893491fbe5d82a33402c366c905d77f160a5f01b2c08aa73b2c0a049202fc3f90d64bdfcdca492e1c4c294239e24244769d0296c9b7dba21eb9b7bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2c589cfead49893491fbe5d82a33402c366c905d77f160a5f01b2c08aa73b2c0",
+                        "s" : "0x49202fc3f90d64bdfcdca492e1c4c294239e24244769d0296c9b7dba21eb9b7b",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3c8cdf1e0bd555b37e66533d7a52cea72e06f08b28b1ac37256ee397f28b5b46",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g2v0.json
index 7a73a41bf..e4344992b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g2v0Filler.json",
+            "sourceHash" : "404af4b8fad9ff26a4a96cf6c32bbf251c13ade76c1f65dc455d8a18fb509f95"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x72d68458e3745536ebbc244a80cbf47e99d01ac76efdbe35d99cb2a5b740f857",
+                    "mixHash" : "0xb733b5f8baa7aca48ef699b9caddbfff73dfa8598ce410ca3ff7931f76d8616d",
+                    "nonce" : "0x02a0735c3a44bd4a",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xa658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0eeb6cc1ffe72b2a93964cc523f66629ed72bf1021f589279a11118cab2f99b0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819a00eeb6cc1ffe72b2a93964cc523f66629ed72bf1021f589279a11118cab2f99b0a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a0b733b5f8baa7aca48ef699b9caddbfff73dfa8598ce410ca3ff7931f76d8616d8802a0735c3a44bd4af90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba03d02bf4e787e1ea6225ff3c295e1d2c680489bbcbe88908aab279c15e136bdc1a04aa72430be82743a7c35c41e69a957e51e7ffbfd35edaff76257ed9f454955b9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3d02bf4e787e1ea6225ff3c295e1d2c680489bbcbe88908aab279c15e136bdc1",
+                        "s" : "0x4aa72430be82743a7c35c41e69a957e51e7ffbfd35edaff76257ed9f454955b9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x72d68458e3745536ebbc244a80cbf47e99d01ac76efdbe35d99cb2a5b740f857",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g3v0.json
index 7a73a41bf..a487902c4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g3v0Filler.json",
+            "sourceHash" : "dec13408d0d39845ee5a177668330a9fea3f3c72797bbac9c1e3f6b1a2bd2abe"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xc1e893fe678f943b96b4167dea3de9691db0854ce3c68776d89e8c123944e432",
+                    "mixHash" : "0x59d50717652da39b1ce69fd355a1dfd0527e6616f961d290ca89d6923a22994a",
+                    "nonce" : "0xa8695b3e3ac8cddf",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0xadd3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x664f9aba117024b86e246325a0b7bbf5c0ca42bb578a6e267da15a0ae04587d9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0add3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50a0664f9aba117024b86e246325a0b7bbf5c0ca42bb578a6e267da15a0ae04587d9a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a059d50717652da39b1ce69fd355a1dfd0527e6616f961d290ca89d6923a22994a88a8695b3e3ac8cddff90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0e8d93ad1bd1e9cfe4d4ed987c7599dd2fc5e8fa15d71ac7ed4c472920d31e2fba05faa6f1e0bfda79a5e46d8f35ca83e8ee80ceb48513f4894763f0faa25629bf8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xe8d93ad1bd1e9cfe4d4ed987c7599dd2fc5e8fa15d71ac7ed4c472920d31e2fb",
+                        "s" : "0x5faa6f1e0bfda79a5e46d8f35ca83e8ee80ceb48513f4894763f0faa25629bf8",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc1e893fe678f943b96b4167dea3de9691db0854ce3c68776d89e8c123944e432",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0.json
index a81b7daf3..dd586ee8c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_1_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0Filler.json",
-            "sourceHash" : "39450f0fa24b921daa40dbe9efac1f1584daeae7d3d37a7b0b771528b5ab6367"
+            "sourceHash" : "3402d79a520bf86498dad7e9504996dbbff0e71a276e4164e96290f5c91f7f9a"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0x36c322476f758dda738fddeea690ec6ca733a9bdf123c5c1509650ac2d759a8b",
-                    "mixHash" : "0x2fc6f089d93ad3b1fe87be6fdfeb2937f112746b9d5974240fd27db873188aae",
-                    "nonce" : "0x5d61290a14dfdf90",
+                    "hash" : "0xc8dcdbe1151a10cd9e4babd7529cd1918e6c9d0e2cfe7d8236274db5dea4ad6b",
+                    "mixHash" : "0x967d0500f49a522bf4591e143d3f1cb12bfadeb71e4d00aff02c5821cc89ba8f",
+                    "nonce" : "0xa5f750990fb75d8a",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0xc9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xdda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08a07b0788d0dfbcaf2f4cf11d78cc71c7a562eef37cde5198c32a4ea29563008a0dda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1da0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a02fc6f089d93ad3b1fe87be6fdfeb2937f112746b9d5974240fd27db873188aae885d61290a14dfdf90f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba0a26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984a065be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08a07b0788d0dfbcaf2f4cf11d78cc71c7a562eef37cde5198c32a4ea29563008a0dda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1da0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0967d0500f49a522bf4591e143d3f1cb12bfadeb71e4d00aff02c5821cc89ba8f88a5f750990fb75d8af90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba0a26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984a065be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x36c322476f758dda738fddeea690ec6ca733a9bdf123c5c1509650ac2d759a8b",
+        "lastblockhash" : "0xc8dcdbe1151a10cd9e4babd7529cd1918e6c9d0e2cfe7d8236274db5dea4ad6b",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g1v0.json
index 7a73a41bf..cc1f101ce 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g1v0Filler.json",
+            "sourceHash" : "42ca09146747d8e5eb9eca817a095bdb1a0d16b7436c94973d913ab68736986f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x0b94f3673e973a9861e89fdfbdd19ff1ec952bf4bb97c40fa10628ca13e2e83b",
+                    "mixHash" : "0x0fc46d3b81a225b99de4285a177c8319b3d5ebe3114eb6e0c88a1da514a90781",
+                    "nonce" : "0xb1e60d463cb1863d",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xfcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9e551e19bcf325eb42d6e04a7ea19e1428f082a68645c68197c4dd62b6fab22d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2ea09e551e19bcf325eb42d6e04a7ea19e1428f082a68645c68197c4dd62b6fab22da022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a00fc46d3b81a225b99de4285a177c8319b3d5ebe3114eb6e0c88a1da514a9078188b1e60d463cb1863df90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba02c589cfead49893491fbe5d82a33402c366c905d77f160a5f01b2c08aa73b2c0a049202fc3f90d64bdfcdca492e1c4c294239e24244769d0296c9b7dba21eb9b7bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2c589cfead49893491fbe5d82a33402c366c905d77f160a5f01b2c08aa73b2c0",
+                        "s" : "0x49202fc3f90d64bdfcdca492e1c4c294239e24244769d0296c9b7dba21eb9b7b",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0b94f3673e973a9861e89fdfbdd19ff1ec952bf4bb97c40fa10628ca13e2e83b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g2v0.json
index 7a73a41bf..eeae16281 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g2v0Filler.json",
+            "sourceHash" : "08d2c9219eb14d545a3bb26a652ded6a5fc34186ee0e8a1157d95f82da3adbab"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0xf6ed8a8ddc9c4353d080324339513a725d4a414f013838354255b0abf61276ad",
+                    "mixHash" : "0x53de2bef9a28cea9898167e1a32ebf0d25025accbc114b76f0755c137bfc3939",
+                    "nonce" : "0xe40f8226b0e1f618",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xa658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0eeb6cc1ffe72b2a93964cc523f66629ed72bf1021f589279a11118cab2f99b0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819a00eeb6cc1ffe72b2a93964cc523f66629ed72bf1021f589279a11118cab2f99b0a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a053de2bef9a28cea9898167e1a32ebf0d25025accbc114b76f0755c137bfc393988e40f8226b0e1f618f90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba03d02bf4e787e1ea6225ff3c295e1d2c680489bbcbe88908aab279c15e136bdc1a04aa72430be82743a7c35c41e69a957e51e7ffbfd35edaff76257ed9f454955b9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3d02bf4e787e1ea6225ff3c295e1d2c680489bbcbe88908aab279c15e136bdc1",
+                        "s" : "0x4aa72430be82743a7c35c41e69a957e51e7ffbfd35edaff76257ed9f454955b9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf6ed8a8ddc9c4353d080324339513a725d4a414f013838354255b0abf61276ad",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g3v0.json
index 7a73a41bf..11f983b08 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g3v0Filler.json",
+            "sourceHash" : "7443131c39f81334d8bd757b98191b5ee3faadd74a4b18819fa454d4ca07edc5"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xd67e72f0e36fb05272e40a8a0c68860c98a273be4d1b5442294512a40d895826",
+                    "mixHash" : "0x0d5520d778677118888fb0a9af42c058b10b4f91e92e0a9c79b63cefd9d884a6",
+                    "nonce" : "0x8929743557a3b2f2",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0xadd3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x664f9aba117024b86e246325a0b7bbf5c0ca42bb578a6e267da15a0ae04587d9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0add3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50a0664f9aba117024b86e246325a0b7bbf5c0ca42bb578a6e267da15a0ae04587d9a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a00d5520d778677118888fb0a9af42c058b10b4f91e92e0a9c79b63cefd9d884a6888929743557a3b2f2f90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0e8d93ad1bd1e9cfe4d4ed987c7599dd2fc5e8fa15d71ac7ed4c472920d31e2fba05faa6f1e0bfda79a5e46d8f35ca83e8ee80ceb48513f4894763f0faa25629bf8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xe8d93ad1bd1e9cfe4d4ed987c7599dd2fc5e8fa15d71ac7ed4c472920d31e2fb",
+                        "s" : "0x5faa6f1e0bfda79a5e46d8f35ca83e8ee80ceb48513f4894763f0faa25629bf8",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd67e72f0e36fb05272e40a8a0c68860c98a273be4d1b5442294512a40d895826",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0.json
index f9cc3be96..ae1056103 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_1_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0Filler.json",
-            "sourceHash" : "f91169c30b4ce04b30d1e4f5e8919b6e34fe9cdfef6f10af6b313ef50ceb6198"
+            "sourceHash" : "e41c2159ad3d83eef5676f5e8c1ac339b508eafc27ffc039c58260768ead5c90"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xfd80",
-                    "hash" : "0xfb280d967c61b89f5fee771a2a07208a80f32942f0f851368e4861553cfed2d3",
-                    "mixHash" : "0x3ba9580ef0e5a2af1997469053a18d8a4b3f91a3647f1af05f6d4bb29d6b4b66",
-                    "nonce" : "0xf2415f6dd2ce7c85",
+                    "hash" : "0x9b27d2e3ba72bf02d6e0d2965894d4158fc84172bcded24622cc515c072f63b1",
+                    "mixHash" : "0x1cf457ddb90c09706a2d392bc16e60dbb8d029a4a3ff403bf26b862e8fb229a7",
+                    "nonce" : "0x3a226db7382f010f",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0xf85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xd6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0da124c513195f233630f447f4d969c561755b9ff3be8a058c190119637a61f98a0d6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9ea0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a03ba9580ef0e5a2af1997469053a18d8a4b3f91a3647f1af05f6d4bb29d6b4b6688f2415f6dd2ce7c85f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0cd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0a03bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0da124c513195f233630f447f4d969c561755b9ff3be8a058c190119637a61f98a0d6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9ea0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a01cf457ddb90c09706a2d392bc16e60dbb8d029a4a3ff403bf26b862e8fb229a7883a226db7382f010ff90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0cd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0a03bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfb280d967c61b89f5fee771a2a07208a80f32942f0f851368e4861553cfed2d3",
+        "lastblockhash" : "0x9b27d2e3ba72bf02d6e0d2965894d4158fc84172bcded24622cc515c072f63b1",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g1v0.json
index 7a73a41bf..5b3c591f5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g1v0Filler.json",
+            "sourceHash" : "5e327931395c29dd3acd3ded0080c7d290359942b5de787b680a3f5c9604a7fe"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0xb8cc57cc597c53ed48f9d0b23a67889ecf2f67fba28a9123b22caba4834f4b1a",
+                    "mixHash" : "0xf81811f00acbb6a65265ed51c477f785635e5930d50cf4871e9b6af978e6aac7",
+                    "nonce" : "0x12a9d984edd9ccac",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xfcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9e551e19bcf325eb42d6e04a7ea19e1428f082a68645c68197c4dd62b6fab22d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2ea09e551e19bcf325eb42d6e04a7ea19e1428f082a68645c68197c4dd62b6fab22da022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0f81811f00acbb6a65265ed51c477f785635e5930d50cf4871e9b6af978e6aac78812a9d984edd9ccacf90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba02c589cfead49893491fbe5d82a33402c366c905d77f160a5f01b2c08aa73b2c0a049202fc3f90d64bdfcdca492e1c4c294239e24244769d0296c9b7dba21eb9b7bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2c589cfead49893491fbe5d82a33402c366c905d77f160a5f01b2c08aa73b2c0",
+                        "s" : "0x49202fc3f90d64bdfcdca492e1c4c294239e24244769d0296c9b7dba21eb9b7b",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb8cc57cc597c53ed48f9d0b23a67889ecf2f67fba28a9123b22caba4834f4b1a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g2v0.json
index 7a73a41bf..a8f8d5ac7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g2v0Filler.json",
+            "sourceHash" : "098b0c16ffe171e426c26f99d626c3e976e40f64fc309498ae5e7266052f59f1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x630926f6afb39cc6eafca1e19edd469b72a656567a1f07369fe530590e76d888",
+                    "mixHash" : "0x544b61372f67c94b0259802a07c0654af5af76b7758191a983f868df6a72a13a",
+                    "nonce" : "0xcf2246bc0019bfd5",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xa658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0eeb6cc1ffe72b2a93964cc523f66629ed72bf1021f589279a11118cab2f99b0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819a00eeb6cc1ffe72b2a93964cc523f66629ed72bf1021f589279a11118cab2f99b0a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a0544b61372f67c94b0259802a07c0654af5af76b7758191a983f868df6a72a13a88cf2246bc0019bfd5f90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba03d02bf4e787e1ea6225ff3c295e1d2c680489bbcbe88908aab279c15e136bdc1a04aa72430be82743a7c35c41e69a957e51e7ffbfd35edaff76257ed9f454955b9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3d02bf4e787e1ea6225ff3c295e1d2c680489bbcbe88908aab279c15e136bdc1",
+                        "s" : "0x4aa72430be82743a7c35c41e69a957e51e7ffbfd35edaff76257ed9f454955b9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x630926f6afb39cc6eafca1e19edd469b72a656567a1f07369fe530590e76d888",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g3v0.json
index 7a73a41bf..2c2cd47c5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g3v0Filler.json",
+            "sourceHash" : "aa792874f6102e44c9f208259b9367f25bfd063a68b1c5a31daa9bcd7fb8b26b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xaf1a34639aa842b41e152546308c626d3bfba2df5d5a9fc79b2d3a444eb8211e",
+                    "mixHash" : "0x4ca6f4369b0364807b044b4c6e3615380ab13ca1353b44617e0720bddc90a354",
+                    "nonce" : "0xed5f968662846c63",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0xadd3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x664f9aba117024b86e246325a0b7bbf5c0ca42bb578a6e267da15a0ae04587d9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0add3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50a0664f9aba117024b86e246325a0b7bbf5c0ca42bb578a6e267da15a0ae04587d9a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a04ca6f4369b0364807b044b4c6e3615380ab13ca1353b44617e0720bddc90a35488ed5f968662846c63f90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0e8d93ad1bd1e9cfe4d4ed987c7599dd2fc5e8fa15d71ac7ed4c472920d31e2fba05faa6f1e0bfda79a5e46d8f35ca83e8ee80ceb48513f4894763f0faa25629bf8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xe8d93ad1bd1e9cfe4d4ed987c7599dd2fc5e8fa15d71ac7ed4c472920d31e2fb",
+                        "s" : "0x5faa6f1e0bfda79a5e46d8f35ca83e8ee80ceb48513f4894763f0faa25629bf8",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaf1a34639aa842b41e152546308c626d3bfba2df5d5a9fc79b2d3a444eb8211e",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0.json
index efea00789..2ae49a561 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_1_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0Filler.json",
-            "sourceHash" : "4d2104fe7830c39cadd629292b9da8e0236f1922fbcb38256c0ce6d81085018e"
+            "sourceHash" : "fd7f061f7365627d3622ca9904104ff6a719196dc6edb8b90a4c41a5c9d9b9e9"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x012490",
-                    "hash" : "0x86dc85fa696f49a8082f1f865086a23540457ea6303e3a8ad78ba265d2953aa1",
-                    "mixHash" : "0x794c7987a38199e9fcbf577601e627c04bdc3ab6e5b0a4c5078f20ba494ea3cc",
-                    "nonce" : "0x1e84f8816cffaa38",
+                    "hash" : "0x40e417ad13d9a7705f6962a1d0ae1d1f1ffc9a47758589687a8e0e6c534dabf4",
+                    "mixHash" : "0xc67ca9bb2149c18544e2156efdbf604dd64eaf9264306f17981aff3b5f6a515c",
+                    "nonce" : "0x157fd305f9cd02d6",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0xf1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x9925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d6669fd57ad43c870d14c3a8f0ae893dd0b6c5f14dda940b10e121e03fcc73d9a09925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91a0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0794c7987a38199e9fcbf577601e627c04bdc3ab6e5b0a4c5078f20ba494ea3cc881e84f8816cffaa38f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca07f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350a03e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1c0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d6669fd57ad43c870d14c3a8f0ae893dd0b6c5f14dda940b10e121e03fcc73d9a09925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91a0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0c67ca9bb2149c18544e2156efdbf604dd64eaf9264306f17981aff3b5f6a515c88157fd305f9cd02d6f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca07f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350a03e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x86dc85fa696f49a8082f1f865086a23540457ea6303e3a8ad78ba265d2953aa1",
+        "lastblockhash" : "0x40e417ad13d9a7705f6962a1d0ae1d1f1ffc9a47758589687a8e0e6c534dabf4",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g1v0.json
index 7a73a41bf..9c43e6d26 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g1v0Filler.json",
+            "sourceHash" : "75db41a17ce15d8cd86a078290cedda10295d3c28734d2324549291d8f4f8b80"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x3984f6079d6c47506fb2225f78de20c4b33197150d56f84b2cbf7045e8c535d8",
+                    "mixHash" : "0xa8880dc0c750e955535e19638b5acb54849ca8dcc8e4c78acc2fd3583a8aff32",
+                    "nonce" : "0x79bb69cf713925ee",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xfcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9e551e19bcf325eb42d6e04a7ea19e1428f082a68645c68197c4dd62b6fab22d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2ea09e551e19bcf325eb42d6e04a7ea19e1428f082a68645c68197c4dd62b6fab22da022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0a8880dc0c750e955535e19638b5acb54849ca8dcc8e4c78acc2fd3583a8aff328879bb69cf713925eef90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba02c589cfead49893491fbe5d82a33402c366c905d77f160a5f01b2c08aa73b2c0a049202fc3f90d64bdfcdca492e1c4c294239e24244769d0296c9b7dba21eb9b7bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2c589cfead49893491fbe5d82a33402c366c905d77f160a5f01b2c08aa73b2c0",
+                        "s" : "0x49202fc3f90d64bdfcdca492e1c4c294239e24244769d0296c9b7dba21eb9b7b",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3984f6079d6c47506fb2225f78de20c4b33197150d56f84b2cbf7045e8c535d8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g2v0.json
index 7a73a41bf..d00444314 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g2v0Filler.json",
+            "sourceHash" : "88457dc9f1fe0c8dfb3cf93813e94cb03bf138076a8ee1ddb64d3c21a6ddff6e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x2b5d9a19876ac70dc6baec4c8876745bbefe3d1e49662c0c5ebae9b09cd3bb08",
+                    "mixHash" : "0x58fc1d4f2f0b8a552bcda14491e7a9c93d08a377c15d2d018ffcb82df77cdfff",
+                    "nonce" : "0x24a8070490bbcc7f",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xa658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0eeb6cc1ffe72b2a93964cc523f66629ed72bf1021f589279a11118cab2f99b0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819a00eeb6cc1ffe72b2a93964cc523f66629ed72bf1021f589279a11118cab2f99b0a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a058fc1d4f2f0b8a552bcda14491e7a9c93d08a377c15d2d018ffcb82df77cdfff8824a8070490bbcc7ff90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba03d02bf4e787e1ea6225ff3c295e1d2c680489bbcbe88908aab279c15e136bdc1a04aa72430be82743a7c35c41e69a957e51e7ffbfd35edaff76257ed9f454955b9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3d02bf4e787e1ea6225ff3c295e1d2c680489bbcbe88908aab279c15e136bdc1",
+                        "s" : "0x4aa72430be82743a7c35c41e69a957e51e7ffbfd35edaff76257ed9f454955b9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2b5d9a19876ac70dc6baec4c8876745bbefe3d1e49662c0c5ebae9b09cd3bb08",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g3v0.json
index 7a73a41bf..238726ea0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_1_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g3v0Filler.json",
+            "sourceHash" : "3dce54981ec9a6f45bc1deadc7c2f9f77ca89d56a7ac5361d3b0fc2926e4cec9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xbe9212328fad46f0068180c50fb99b7565d91ebb61845dd1ef8ac779cb5fd77b",
+                    "mixHash" : "0x996bb5c33a461070050d5af809bb5b21a638edafaf0834663875790d6e94d6fd",
+                    "nonce" : "0xd2319b3421263e63",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0xadd3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x664f9aba117024b86e246325a0b7bbf5c0ca42bb578a6e267da15a0ae04587d9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0add3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50a0664f9aba117024b86e246325a0b7bbf5c0ca42bb578a6e267da15a0ae04587d9a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0996bb5c33a461070050d5af809bb5b21a638edafaf0834663875790d6e94d6fd88d2319b3421263e63f90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0e8d93ad1bd1e9cfe4d4ed987c7599dd2fc5e8fa15d71ac7ed4c472920d31e2fba05faa6f1e0bfda79a5e46d8f35ca83e8ee80ceb48513f4894763f0faa25629bf8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xe8d93ad1bd1e9cfe4d4ed987c7599dd2fc5e8fa15d71ac7ed4c472920d31e2fb",
+                        "s" : "0x5faa6f1e0bfda79a5e46d8f35ca83e8ee80ceb48513f4894763f0faa25629bf8",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbe9212328fad46f0068180c50fb99b7565d91ebb61845dd1ef8ac779cb5fd77b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0.json
index af432da6a..ccc224916 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_37120_37111_37111_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0Filler.json",
             "sourceHash" : "56529832e361b0045cd3a3248ffb2cb1006617116335da0c3a41dac8d56cebad"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0b76d2",
-                    "hash" : "0x85657a3f1966424b62b0ef92cced131697aff0c47269bccdb796bbd403a96edb",
-                    "mixHash" : "0xa3ddbe2b9214a4bd8b2e09286ed939b638594e3fdb2a78359fb5d97a83d5ddd5",
-                    "nonce" : "0xd7b4455504f46542",
+                    "hash" : "0xc7ec2407c15fc848f72fd47aec9e0a05414b65bfef1123218ded1ffb22af999f",
+                    "mixHash" : "0xaebec8a830d46970b7fb6a61c71e8cc68c5054cb18bdc0b25bb55665c1ca99d8",
+                    "nonce" : "0x3425f0545f8bacfe",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x8c0e9bed118adcd3c386f1ea165a7831a3123569384e482839964551837f3dfe",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xc0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37ed",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac1ef5ecc84dbdde01c0e76569b84b8c0de4f41629f3396b12bb6a9e50dcab67a0c0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37eda08c0e9bed118adcd3c386f1ea165a7831a3123569384e482839964551837f3dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830b76d28203e880a0a3ddbe2b9214a4bd8b2e09286ed939b638594e3fdb2a78359fb5d97a83d5ddd588d7b4455504f46542f90289f902860101830fff5894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33a070cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac1ef5ecc84dbdde01c0e76569b84b8c0de4f41629f3396b12bb6a9e50dcab67a0c0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37eda08c0e9bed118adcd3c386f1ea165a7831a3123569384e482839964551837f3dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830b76d28203e880a0aebec8a830d46970b7fb6a61c71e8cc68c5054cb18bdc0b25bb55665c1ca99d8883425f0545f8bacfef90289f902860101830fff5894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33a070cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x85657a3f1966424b62b0ef92cced131697aff0c47269bccdb796bbd403a96edb",
+        "lastblockhash" : "0xc7ec2407c15fc848f72fd47aec9e0a05414b65bfef1123218ded1ffb22af999f",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g1v0.json
index 7a73a41bf..e9bf6dccc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g1v0Filler.json",
+            "sourceHash" : "b0b8dac91d3dfa892312a371ab9158b737a7e1cbea7b0f956ca26b87c2d719b5"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0xb7185b90f3a335bc102bcdd1efb49a1c4697ed50727838d97642a8f7e3a8f6cf",
+                    "mixHash" : "0x6f107afcf9a213acb4d8f10ad715216327815cba443d65591859aeadb6a07fa6",
+                    "nonce" : "0x799fcf598a3d4442",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xa74494ffc6e2bae3a7b3823e0ad12338c9d936dd591f24836e10ced7b8f72102",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9618a26e55597484122cd43b81bab4aad69a8b5ad9ffb1315eef6f06ae3164d5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a74494ffc6e2bae3a7b3823e0ad12338c9d936dd591f24836e10ced7b8f72102a09618a26e55597484122cd43b81bab4aad69a8b5ad9ffb1315eef6f06ae3164d5a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a06f107afcf9a213acb4d8f10ad715216327815cba443d65591859aeadb6a07fa688799fcf598a3d4442f90289f90286010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca0996931929ad9c029a7bdf1ec1f35ef33ec1fe8448dcc4057d7f3b0864804cf09a0552a4cec72f3658edd9aa6418454c4af9880ede912fab7954b271696581283bac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x996931929ad9c029a7bdf1ec1f35ef33ec1fe8448dcc4057d7f3b0864804cf09",
+                        "s" : "0x552a4cec72f3658edd9aa6418454c4af9880ede912fab7954b271696581283ba",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb7185b90f3a335bc102bcdd1efb49a1c4697ed50727838d97642a8f7e3a8f6cf",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g2v0.json
index 7a73a41bf..538693b21 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g2v0Filler.json",
+            "sourceHash" : "617ca0fc4b46eb513a4b5ee69817a769193acb3890377bf3abfcbd366e2e0c83"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x89ae4e0708c21e0edad85453e0be29f35c53231947bbf0ca5bbd2f9c9be714f3",
+                    "mixHash" : "0xc32b89735da9224cd8583c8feea634540799b562f5441e917977475b24145d99",
+                    "nonce" : "0x8e72594a5257a3f4",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x0b5a9b608961477ca227b1172fa80f596a1caab4386fa3d683932d68e89373db",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x829bc499c948dcf28bebec909f52fd6d508a02f8e1873a9f46dce37bfde79ecd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b5a9b608961477ca227b1172fa80f596a1caab4386fa3d683932d68e89373dba0829bc499c948dcf28bebec909f52fd6d508a02f8e1873a9f46dce37bfde79ecda0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a0c32b89735da9224cd8583c8feea634540799b562f5441e917977475b24145d99888e72594a5257a3f4f90289f9028601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba07d44b9368ab6399496ec13c7b4a429710bb4138365759b6189a75f7dd70e27dea0661f7494627285de27c1ae3362f0f3dfbf2d4ac1a952b0ecb60bc29691e982f9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7d44b9368ab6399496ec13c7b4a429710bb4138365759b6189a75f7dd70e27de",
+                        "s" : "0x661f7494627285de27c1ae3362f0f3dfbf2d4ac1a952b0ecb60bc29691e982f9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x89ae4e0708c21e0edad85453e0be29f35c53231947bbf0ca5bbd2f9c9be714f3",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g3v0.json
index 7a73a41bf..150e5c588 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g3v0Filler.json",
+            "sourceHash" : "e3068623c534d5c333f50cbd8b373b8ab1dcbc448a70f992080335065ed308d9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x0f2ba94a60511c112493f38a1b1b6cacd2b2a19b1a995b2324fe962b83acf9d8",
+                    "mixHash" : "0xf6507940f515ac89a4848743757d05cd44ac8e8d953a0d99fff9ec1dc4e4903f",
+                    "nonce" : "0x342f13a5661910df",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x00e22632313c4a064f94cbec474fb3bb935b972d72a188e1fe40c59f4b23f00f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x01d37cc549aedaee1cba2f798a0945fbd867b231c1a5bc541c4caf406138d04d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a000e22632313c4a064f94cbec474fb3bb935b972d72a188e1fe40c59f4b23f00fa001d37cc549aedaee1cba2f798a0945fbd867b231c1a5bc541c4caf406138d04da0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0f6507940f515ac89a4848743757d05cd44ac8e8d953a0d99fff9ec1dc4e4903f88342f13a5661910dff90289f90286010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba04917ae0c5d611c0eb0978092cb006ad795245789538e8438679924d7eb19b40da05c679e8c53944b60b2b039ef78c6d2f456f62a182f99d25dcf3ebb9a4d1377d0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4917ae0c5d611c0eb0978092cb006ad795245789538e8438679924d7eb19b40d",
+                        "s" : "0x5c679e8c53944b60b2b039ef78c6d2f456f62a182f99d25dcf3ebb9a4d1377d0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0f2ba94a60511c112493f38a1b1b6cacd2b2a19b1a995b2324fe962b83acf9d8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0.json
index b4833a035..971ebb8b2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_37111_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0Filler.json",
-            "sourceHash" : "e3d9bbb406a71e439b18a68c417844cbfd7769bedfa0e978d6919c88cc5e14e6"
+            "sourceHash" : "994cb6a79100ab842a29bb1670529b29f22727fc6ebbbf519cc1a3329d5a3f22"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x031a90",
-                    "hash" : "0x4adaedc7205b4fcdf3d9f9b7c33c8fa161770242aa4f5f03f2b65d6b1d5fe00e",
-                    "mixHash" : "0x577934ccbfdd17b38630e25d9411d34c48c256fc6171fc3bf4114c41d1938a03",
-                    "nonce" : "0x9a20686b269ff092",
+                    "hash" : "0xdb2601b8496a973a7cff5928fc6e4d9503bc8218b66371e66aa67a3b0a46ab1d",
+                    "mixHash" : "0x90dc3a7652d953e148011d996866d7795a0b566f667aaf93e8ef32517a5f10af",
+                    "nonce" : "0xde9edf0dd483b5a4",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x3a8142f0b9e11966bb1d89824f452c4acd340a4a299fec41c4dfc752fb170a3a",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xd9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d27d519596bdbe74bdde1969b69474166231807fc0cb53e1de0923014d55f52ea0d9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988ca03a8142f0b9e11966bb1d89824f452c4acd340a4a299fec41c4dfc752fb170a3ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083031a908203e880a0577934ccbfdd17b38630e25d9411d34c48c256fc6171fc3bf4114c41d1938a03889a20686b269ff092f90289f90286010183031a9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0c2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84fa04fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d27d519596bdbe74bdde1969b69474166231807fc0cb53e1de0923014d55f52ea0d9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988ca03a8142f0b9e11966bb1d89824f452c4acd340a4a299fec41c4dfc752fb170a3ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083031a908203e880a090dc3a7652d953e148011d996866d7795a0b566f667aaf93e8ef32517a5f10af88de9edf0dd483b5a4f90289f90286010183031a9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0c2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84fa04fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4adaedc7205b4fcdf3d9f9b7c33c8fa161770242aa4f5f03f2b65d6b1d5fe00e",
+        "lastblockhash" : "0xdb2601b8496a973a7cff5928fc6e4d9503bc8218b66371e66aa67a3b0a46ab1d",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g1v0.json
index 7a73a41bf..ddd983d6f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g1v0Filler.json",
+            "sourceHash" : "6dba0714f8f2da95db93aa6d2fac3300b2a9a963326fe04c8680eb24ca473e4d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0xd21a1ef6e2944c912c546d20d6fda5ed84593b912888bc93f867f75db4e2d59c",
+                    "mixHash" : "0x656505edeb81513e9aeea88a80f0ec909c131d492fef7955ea74f3a32b5b89a3",
+                    "nonce" : "0xc599f2e8706a43a9",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xa74494ffc6e2bae3a7b3823e0ad12338c9d936dd591f24836e10ced7b8f72102",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9618a26e55597484122cd43b81bab4aad69a8b5ad9ffb1315eef6f06ae3164d5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a74494ffc6e2bae3a7b3823e0ad12338c9d936dd591f24836e10ced7b8f72102a09618a26e55597484122cd43b81bab4aad69a8b5ad9ffb1315eef6f06ae3164d5a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0656505edeb81513e9aeea88a80f0ec909c131d492fef7955ea74f3a32b5b89a388c599f2e8706a43a9f90289f90286010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca0996931929ad9c029a7bdf1ec1f35ef33ec1fe8448dcc4057d7f3b0864804cf09a0552a4cec72f3658edd9aa6418454c4af9880ede912fab7954b271696581283bac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x996931929ad9c029a7bdf1ec1f35ef33ec1fe8448dcc4057d7f3b0864804cf09",
+                        "s" : "0x552a4cec72f3658edd9aa6418454c4af9880ede912fab7954b271696581283ba",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd21a1ef6e2944c912c546d20d6fda5ed84593b912888bc93f867f75db4e2d59c",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g2v0.json
index 7a73a41bf..420a32f0a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g2v0Filler.json",
+            "sourceHash" : "1fe10f670ed90001c7a2892f4ae64321c09b86efad1b1205440c14ec46149639"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x2dc5865706a16a7823d992bf97789386e7279c047ad2234b9fe20bdf84acaac7",
+                    "mixHash" : "0xf6bcda28efee7551f2510e9bb0a7c1eb1c92f9287bc65a1e16e81ec1f1f5efcb",
+                    "nonce" : "0xda30be4e3cdc776c",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x0b5a9b608961477ca227b1172fa80f596a1caab4386fa3d683932d68e89373db",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x829bc499c948dcf28bebec909f52fd6d508a02f8e1873a9f46dce37bfde79ecd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b5a9b608961477ca227b1172fa80f596a1caab4386fa3d683932d68e89373dba0829bc499c948dcf28bebec909f52fd6d508a02f8e1873a9f46dce37bfde79ecda0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a0f6bcda28efee7551f2510e9bb0a7c1eb1c92f9287bc65a1e16e81ec1f1f5efcb88da30be4e3cdc776cf90289f9028601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba07d44b9368ab6399496ec13c7b4a429710bb4138365759b6189a75f7dd70e27dea0661f7494627285de27c1ae3362f0f3dfbf2d4ac1a952b0ecb60bc29691e982f9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7d44b9368ab6399496ec13c7b4a429710bb4138365759b6189a75f7dd70e27de",
+                        "s" : "0x661f7494627285de27c1ae3362f0f3dfbf2d4ac1a952b0ecb60bc29691e982f9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2dc5865706a16a7823d992bf97789386e7279c047ad2234b9fe20bdf84acaac7",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g3v0.json
index 7a73a41bf..29038cc14 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g3v0Filler.json",
+            "sourceHash" : "31bdb787ede8a311fec2da48420f7538e95dd89f68e7d6a0605f2f351222ff7d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xe44d904aed822baba2135d3df37dec9da556206d79cd285a41e432769cfb8204",
+                    "mixHash" : "0xf96bfec60e765c290a0a253554d5b59dcb7e4b2cc0cce84921a138114640865b",
+                    "nonce" : "0x44a03d65137a3da6",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x00e22632313c4a064f94cbec474fb3bb935b972d72a188e1fe40c59f4b23f00f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x01d37cc549aedaee1cba2f798a0945fbd867b231c1a5bc541c4caf406138d04d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a000e22632313c4a064f94cbec474fb3bb935b972d72a188e1fe40c59f4b23f00fa001d37cc549aedaee1cba2f798a0945fbd867b231c1a5bc541c4caf406138d04da0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0f96bfec60e765c290a0a253554d5b59dcb7e4b2cc0cce84921a138114640865b8844a03d65137a3da6f90289f90286010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba04917ae0c5d611c0eb0978092cb006ad795245789538e8438679924d7eb19b40da05c679e8c53944b60b2b039ef78c6d2f456f62a182f99d25dcf3ebb9a4d1377d0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4917ae0c5d611c0eb0978092cb006ad795245789538e8438679924d7eb19b40d",
+                        "s" : "0x5c679e8c53944b60b2b039ef78c6d2f456f62a182f99d25dcf3ebb9a4d1377d0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe44d904aed822baba2135d3df37dec9da556206d79cd285a41e432769cfb8204",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0.json
index 3f7628933..85dabf9cf 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_37111_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0Filler.json",
-            "sourceHash" : "0a35ca789e34c90c992a8faa2d3fdc71369a09f0c555267ba5be8a4235152178"
+            "sourceHash" : "df287d5aa87b2964a3fa53b09e2ba36c042d6e66691c0e4f390bd634f8da0d80"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x010d2c",
-                    "hash" : "0x7bd831a6051a4437634d5be353e5ee88163f445978b60cf920137cd1921916fe",
-                    "mixHash" : "0xf1127fb856ed3ca0efb3eccc014e4a5fbfbb246e4fdd3d388419bcce23cbe417",
-                    "nonce" : "0x028e3491e727849b",
+                    "hash" : "0xc0b6f243558fe15fde4550823266eb782cad9aa8847a96cda8714adbccce1cae",
+                    "mixHash" : "0xc11e15aa32bf1d6eaeb635f7e060b6f8c3341c76170f31fe6a366366c1f1ee8e",
+                    "nonce" : "0x6fd999195df31eff",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x584dc39cc3eb9e978c112eb463b0249860447f592df4581113cc4b827e116a19",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x5d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00843d11dca7e4f4cfa2daa8e0c25082d19d42be470d142a0dfbbe6523d8ddce0a05d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85a0584dc39cc3eb9e978c112eb463b0249860447f592df4581113cc4b827e116a19b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010d2c8203e880a0f1127fb856ed3ca0efb3eccc014e4a5fbfbb246e4fdd3d388419bcce23cbe41788028e3491e727849bf90289f90286010183010d2c94c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4a00cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00843d11dca7e4f4cfa2daa8e0c25082d19d42be470d142a0dfbbe6523d8ddce0a05d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85a0584dc39cc3eb9e978c112eb463b0249860447f592df4581113cc4b827e116a19b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010d2c8203e880a0c11e15aa32bf1d6eaeb635f7e060b6f8c3341c76170f31fe6a366366c1f1ee8e886fd999195df31efff90289f90286010183010d2c94c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4a00cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bd831a6051a4437634d5be353e5ee88163f445978b60cf920137cd1921916fe",
+        "lastblockhash" : "0xc0b6f243558fe15fde4550823266eb782cad9aa8847a96cda8714adbccce1cae",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g1v0.json
index 7a73a41bf..9bdb199ca 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g1v0Filler.json",
+            "sourceHash" : "2b7a606e3cef083a92d69012e9b2b4a8ee6659b2691150ba725aace10a93482a"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0xcad2788e3dfa2b4a26fa5971d768c46a8b62fe1017e4301ef22837332916f534",
+                    "mixHash" : "0x47d871dea6265e5835043e08b0d65e77baac7048461f28001c374b3a8d2ae048",
+                    "nonce" : "0x1f19398a3213bafe",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xa74494ffc6e2bae3a7b3823e0ad12338c9d936dd591f24836e10ced7b8f72102",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9618a26e55597484122cd43b81bab4aad69a8b5ad9ffb1315eef6f06ae3164d5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a74494ffc6e2bae3a7b3823e0ad12338c9d936dd591f24836e10ced7b8f72102a09618a26e55597484122cd43b81bab4aad69a8b5ad9ffb1315eef6f06ae3164d5a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a047d871dea6265e5835043e08b0d65e77baac7048461f28001c374b3a8d2ae048881f19398a3213bafef90289f90286010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca0996931929ad9c029a7bdf1ec1f35ef33ec1fe8448dcc4057d7f3b0864804cf09a0552a4cec72f3658edd9aa6418454c4af9880ede912fab7954b271696581283bac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x996931929ad9c029a7bdf1ec1f35ef33ec1fe8448dcc4057d7f3b0864804cf09",
+                        "s" : "0x552a4cec72f3658edd9aa6418454c4af9880ede912fab7954b271696581283ba",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcad2788e3dfa2b4a26fa5971d768c46a8b62fe1017e4301ef22837332916f534",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g2v0.json
index 7a73a41bf..80e913c43 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g2v0Filler.json",
+            "sourceHash" : "2bf6669af5b6df4c7366e6fea5c823547153b89c6b2c2a69f9a0ca2c8b85fb45"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x4677a9ced5a6c46682b1aa7f8f3e7f44e51e4b168a4026d2f690319779bc67f7",
+                    "mixHash" : "0xa3ae9681cb620349af14122f7e32536417eff502d502f1057ee7b8483e3296cc",
+                    "nonce" : "0xac2fc53f7db9d3d8",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x0b5a9b608961477ca227b1172fa80f596a1caab4386fa3d683932d68e89373db",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x829bc499c948dcf28bebec909f52fd6d508a02f8e1873a9f46dce37bfde79ecd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b5a9b608961477ca227b1172fa80f596a1caab4386fa3d683932d68e89373dba0829bc499c948dcf28bebec909f52fd6d508a02f8e1873a9f46dce37bfde79ecda0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a0a3ae9681cb620349af14122f7e32536417eff502d502f1057ee7b8483e3296cc88ac2fc53f7db9d3d8f90289f9028601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba07d44b9368ab6399496ec13c7b4a429710bb4138365759b6189a75f7dd70e27dea0661f7494627285de27c1ae3362f0f3dfbf2d4ac1a952b0ecb60bc29691e982f9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7d44b9368ab6399496ec13c7b4a429710bb4138365759b6189a75f7dd70e27de",
+                        "s" : "0x661f7494627285de27c1ae3362f0f3dfbf2d4ac1a952b0ecb60bc29691e982f9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4677a9ced5a6c46682b1aa7f8f3e7f44e51e4b168a4026d2f690319779bc67f7",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g3v0.json
index 7a73a41bf..0d8900688 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g3v0Filler.json",
+            "sourceHash" : "0fe5ba5cc67c46d86eb59465d1cdc13ee5cb9bc3d783c1fba78a5f9196902808"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x265b18f70cc486617bcc8e41e23c6b50495c331e0340706d51292d07890d6c6a",
+                    "mixHash" : "0x9866170a91675fd7b2bfe532f6d06372e09948492228db55f7adc6b204c94af5",
+                    "nonce" : "0x65a8aeeb9dcb75d6",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x00e22632313c4a064f94cbec474fb3bb935b972d72a188e1fe40c59f4b23f00f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x01d37cc549aedaee1cba2f798a0945fbd867b231c1a5bc541c4caf406138d04d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a000e22632313c4a064f94cbec474fb3bb935b972d72a188e1fe40c59f4b23f00fa001d37cc549aedaee1cba2f798a0945fbd867b231c1a5bc541c4caf406138d04da0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a09866170a91675fd7b2bfe532f6d06372e09948492228db55f7adc6b204c94af58865a8aeeb9dcb75d6f90289f90286010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba04917ae0c5d611c0eb0978092cb006ad795245789538e8438679924d7eb19b40da05c679e8c53944b60b2b039ef78c6d2f456f62a182f99d25dcf3ebb9a4d1377d0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4917ae0c5d611c0eb0978092cb006ad795245789538e8438679924d7eb19b40d",
+                        "s" : "0x5c679e8c53944b60b2b039ef78c6d2f456f62a182f99d25dcf3ebb9a4d1377d0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x265b18f70cc486617bcc8e41e23c6b50495c331e0340706d51292d07890d6c6a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0.json
index 802ec8e87..05ec466ca 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_37111_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0Filler.json",
-            "sourceHash" : "c8a454d769ccae76d318f06151cbe90f57a60df28dd1bcbaf9461a4cd860b922"
+            "sourceHash" : "5c02307302f6ace652a467111116f20918e007e04d50d7e208c748cba8eddbf0"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x011308",
-                    "hash" : "0x01e09d72f1057d4ddadb3a4d5fe4e50827893624b7f872f672d57c03aa9c7488",
-                    "mixHash" : "0x18ee5681ec48aba0e249312102bd564a01e76bc54147774e09cda4c11dd6afb6",
-                    "nonce" : "0x25f54f052276a25c",
+                    "hash" : "0xe05f8e3b1173bbe726b2cffc1d5502d219f7345541a9d7a02cdebd747d104cfe",
+                    "mixHash" : "0x0bd430a72cd8263ee96e4991b816441999586cfe5122fb54a1b97bc71424dbe9",
+                    "nonce" : "0xd23fbab0150eba5b",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x19721db51cc1fbb3e18b8d8804d370b9197e655e5e9120df6ae77f498a77414b",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x1dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03bbf29a29d666c8f981cea392e1cd16435466f9eeb5141567df841af5bd0e5d1a01dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8da019721db51cc1fbb3e18b8d8804d370b9197e655e5e9120df6ae77f498a77414bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113088203e880a018ee5681ec48aba0e249312102bd564a01e76bc54147774e09cda4c11dd6afb68825f54f052276a25cf90289f9028601018301130894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0cee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbafa0148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03bbf29a29d666c8f981cea392e1cd16435466f9eeb5141567df841af5bd0e5d1a01dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8da019721db51cc1fbb3e18b8d8804d370b9197e655e5e9120df6ae77f498a77414bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113088203e880a00bd430a72cd8263ee96e4991b816441999586cfe5122fb54a1b97bc71424dbe988d23fbab0150eba5bf90289f9028601018301130894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0cee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbafa0148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01e09d72f1057d4ddadb3a4d5fe4e50827893624b7f872f672d57c03aa9c7488",
+        "lastblockhash" : "0xe05f8e3b1173bbe726b2cffc1d5502d219f7345541a9d7a02cdebd747d104cfe",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g1v0.json
index 7a73a41bf..327350a09 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g1v0Filler.json",
+            "sourceHash" : "016b050d38ac9b8fd080c4ec4f117bdc169d3810a228db5fc827164fb479e77d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x86b6dd439da9f272639a699ef80016d0aeade94b2685d71a7242a97f117565f4",
+                    "mixHash" : "0x304cacc2f0da8f8cec54397d8b24744b7da70f48dc9139cc7ca386915f64a16f",
+                    "nonce" : "0x07382cc6129fbd96",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xa74494ffc6e2bae3a7b3823e0ad12338c9d936dd591f24836e10ced7b8f72102",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9618a26e55597484122cd43b81bab4aad69a8b5ad9ffb1315eef6f06ae3164d5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a74494ffc6e2bae3a7b3823e0ad12338c9d936dd591f24836e10ced7b8f72102a09618a26e55597484122cd43b81bab4aad69a8b5ad9ffb1315eef6f06ae3164d5a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0304cacc2f0da8f8cec54397d8b24744b7da70f48dc9139cc7ca386915f64a16f8807382cc6129fbd96f90289f90286010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca0996931929ad9c029a7bdf1ec1f35ef33ec1fe8448dcc4057d7f3b0864804cf09a0552a4cec72f3658edd9aa6418454c4af9880ede912fab7954b271696581283bac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x996931929ad9c029a7bdf1ec1f35ef33ec1fe8448dcc4057d7f3b0864804cf09",
+                        "s" : "0x552a4cec72f3658edd9aa6418454c4af9880ede912fab7954b271696581283ba",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x86b6dd439da9f272639a699ef80016d0aeade94b2685d71a7242a97f117565f4",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g2v0.json
index 7a73a41bf..b77a49003 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g2v0Filler.json",
+            "sourceHash" : "8cfe4a785f0bf90ba9f2ee2768b8450ca02b5c2fc20e48fe38b7e6c1e12ce01c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x6d397e91ed1bea796858dc79a24c0f187c5ce5e9f7022d721565e26f66c024b7",
+                    "mixHash" : "0x0059f7e64f13f648f2bdf8d0e086a0b2315f10a1bfbc04b301a8b2d1116eb169",
+                    "nonce" : "0x494ca67c3b40bf65",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x0b5a9b608961477ca227b1172fa80f596a1caab4386fa3d683932d68e89373db",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x829bc499c948dcf28bebec909f52fd6d508a02f8e1873a9f46dce37bfde79ecd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b5a9b608961477ca227b1172fa80f596a1caab4386fa3d683932d68e89373dba0829bc499c948dcf28bebec909f52fd6d508a02f8e1873a9f46dce37bfde79ecda0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a00059f7e64f13f648f2bdf8d0e086a0b2315f10a1bfbc04b301a8b2d1116eb16988494ca67c3b40bf65f90289f9028601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba07d44b9368ab6399496ec13c7b4a429710bb4138365759b6189a75f7dd70e27dea0661f7494627285de27c1ae3362f0f3dfbf2d4ac1a952b0ecb60bc29691e982f9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7d44b9368ab6399496ec13c7b4a429710bb4138365759b6189a75f7dd70e27de",
+                        "s" : "0x661f7494627285de27c1ae3362f0f3dfbf2d4ac1a952b0ecb60bc29691e982f9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6d397e91ed1bea796858dc79a24c0f187c5ce5e9f7022d721565e26f66c024b7",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g3v0.json
index 7a73a41bf..9525da5d4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g3v0Filler.json",
+            "sourceHash" : "365f356de108eb221f621d30c2155784415450005e7756483fd9563ee8d935b2"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x9f633ebc6ab48d8bed62fe8234081133c58f8e04000d3a8eafb8a269fdcba146",
+                    "mixHash" : "0xb9d14e942b92ffc91112ce2fcf0724d7c86680876369a2903c19754a14cadb89",
+                    "nonce" : "0x64c086b6a3b327a4",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x00e22632313c4a064f94cbec474fb3bb935b972d72a188e1fe40c59f4b23f00f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x01d37cc549aedaee1cba2f798a0945fbd867b231c1a5bc541c4caf406138d04d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a000e22632313c4a064f94cbec474fb3bb935b972d72a188e1fe40c59f4b23f00fa001d37cc549aedaee1cba2f798a0945fbd867b231c1a5bc541c4caf406138d04da0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0b9d14e942b92ffc91112ce2fcf0724d7c86680876369a2903c19754a14cadb898864c086b6a3b327a4f90289f90286010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba04917ae0c5d611c0eb0978092cb006ad795245789538e8438679924d7eb19b40da05c679e8c53944b60b2b039ef78c6d2f456f62a182f99d25dcf3ebb9a4d1377d0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4917ae0c5d611c0eb0978092cb006ad795245789538e8438679924d7eb19b40d",
+                        "s" : "0x5c679e8c53944b60b2b039ef78c6d2f456f62a182f99d25dcf3ebb9a4d1377d0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9f633ebc6ab48d8bed62fe8234081133c58f8e04000d3a8eafb8a269fdcba146",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0.json
index 0e945adae..0af6958d0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_37111_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0Filler.json",
-            "sourceHash" : "e2a82bfe2960d917fc5cf502325978358c7c65b93048eebfecd0b5086f0dbe4b"
+            "sourceHash" : "4451fe3c083eac56500d836b214a5d15ce99119d22fb52bc491b005464d99ffc"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x011ec0",
-                    "hash" : "0x3e535a4141c05de92c6dc53a77633dba2a49e054dfc35f403b4a948f2e28b8a5",
-                    "mixHash" : "0xfde1ae1c790bc36d0a2ac833cb74dc56a30fdb86191c39da49c62867a861d29d",
-                    "nonce" : "0xff3cbe1c866562f4",
+                    "hash" : "0xf7b9541069c5100d0ff14342b1a04b46adb6c3aa9adf8be385d8caefbaf02275",
+                    "mixHash" : "0xce0eed779a8aa0c3a09489e81d35e1029cfbb0abbeb99c48dc237b3a70be2611",
+                    "nonce" : "0xcabdda889751aa1d",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x8de6a10b876d82ccce671adbc904f813b7cd0121c756d5bc4aae0d677ad51f74",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x8ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b10ae01df7e5e9e46119181792231c16460dd565f4e0b7df0bf4dd4fcff959aa08ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208ca08de6a10b876d82ccce671adbc904f813b7cd0121c756d5bc4aae0d677ad51f74b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011ec08203e880a0fde1ae1c790bc36d0a2ac833cb74dc56a30fdb86191c39da49c62867a861d29d88ff3cbe1c866562f4f90289f90286010183011ec094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975ca0733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741ac0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b10ae01df7e5e9e46119181792231c16460dd565f4e0b7df0bf4dd4fcff959aa08ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208ca08de6a10b876d82ccce671adbc904f813b7cd0121c756d5bc4aae0d677ad51f74b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011ec08203e880a0ce0eed779a8aa0c3a09489e81d35e1029cfbb0abbeb99c48dc237b3a70be261188cabdda889751aa1df90289f90286010183011ec094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975ca0733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e535a4141c05de92c6dc53a77633dba2a49e054dfc35f403b4a948f2e28b8a5",
+        "lastblockhash" : "0xf7b9541069c5100d0ff14342b1a04b46adb6c3aa9adf8be385d8caefbaf02275",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g1v0.json
index 7a73a41bf..fcffc9625 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g1v0Filler.json",
+            "sourceHash" : "e347cbb3068a37786a638363240abd9f39892d8c124a762f2ac372e0a372d347"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x3fc48e144313aca731f44a048ad348592d6b90705c0775fbdac995dfc66c3741",
+                    "mixHash" : "0xabfe2c77341473904ff47a021b054081c929c47516a6f6f10e6665f4141074d0",
+                    "nonce" : "0x63564ce213e1a4ab",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xa74494ffc6e2bae3a7b3823e0ad12338c9d936dd591f24836e10ced7b8f72102",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9618a26e55597484122cd43b81bab4aad69a8b5ad9ffb1315eef6f06ae3164d5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a74494ffc6e2bae3a7b3823e0ad12338c9d936dd591f24836e10ced7b8f72102a09618a26e55597484122cd43b81bab4aad69a8b5ad9ffb1315eef6f06ae3164d5a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0abfe2c77341473904ff47a021b054081c929c47516a6f6f10e6665f4141074d08863564ce213e1a4abf90289f90286010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca0996931929ad9c029a7bdf1ec1f35ef33ec1fe8448dcc4057d7f3b0864804cf09a0552a4cec72f3658edd9aa6418454c4af9880ede912fab7954b271696581283bac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x996931929ad9c029a7bdf1ec1f35ef33ec1fe8448dcc4057d7f3b0864804cf09",
+                        "s" : "0x552a4cec72f3658edd9aa6418454c4af9880ede912fab7954b271696581283ba",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3fc48e144313aca731f44a048ad348592d6b90705c0775fbdac995dfc66c3741",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g2v0.json
index 7a73a41bf..8273703b8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g2v0Filler.json",
+            "sourceHash" : "86fa4e364d23e33189056ff84df89869a531cb02df0fcf26d4d0229f50262763"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x09ecd056e3334e4553e11b9588294dc0186128df39a7429c3a5412a5311f416b",
+                    "mixHash" : "0x7c6d9faac7d37a5c3a4e222acb1b0d24bfda79b9c2222c2bc73df4a06bff0ba4",
+                    "nonce" : "0x61afc47fafa32dc1",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x0b5a9b608961477ca227b1172fa80f596a1caab4386fa3d683932d68e89373db",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x829bc499c948dcf28bebec909f52fd6d508a02f8e1873a9f46dce37bfde79ecd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b5a9b608961477ca227b1172fa80f596a1caab4386fa3d683932d68e89373dba0829bc499c948dcf28bebec909f52fd6d508a02f8e1873a9f46dce37bfde79ecda0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a07c6d9faac7d37a5c3a4e222acb1b0d24bfda79b9c2222c2bc73df4a06bff0ba48861afc47fafa32dc1f90289f9028601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba07d44b9368ab6399496ec13c7b4a429710bb4138365759b6189a75f7dd70e27dea0661f7494627285de27c1ae3362f0f3dfbf2d4ac1a952b0ecb60bc29691e982f9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7d44b9368ab6399496ec13c7b4a429710bb4138365759b6189a75f7dd70e27de",
+                        "s" : "0x661f7494627285de27c1ae3362f0f3dfbf2d4ac1a952b0ecb60bc29691e982f9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x09ecd056e3334e4553e11b9588294dc0186128df39a7429c3a5412a5311f416b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g3v0.json
index 7a73a41bf..6a0d40341 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g3v0Filler.json",
+            "sourceHash" : "5416b2e486713493d561c5e08240e92a343048ea185d3b71e2cdc4255d3c4edd"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xc7550ee677898ea96508d009b5c64f3d293f001968b5a6ef436193ec0b93336a",
+                    "mixHash" : "0xced94c71635e32f49a90b4c0c46c8343e7295dedff2957e0d7fb89091a9ad65a",
+                    "nonce" : "0x04de1e38ba0a03bd",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x00e22632313c4a064f94cbec474fb3bb935b972d72a188e1fe40c59f4b23f00f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x01d37cc549aedaee1cba2f798a0945fbd867b231c1a5bc541c4caf406138d04d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a000e22632313c4a064f94cbec474fb3bb935b972d72a188e1fe40c59f4b23f00fa001d37cc549aedaee1cba2f798a0945fbd867b231c1a5bc541c4caf406138d04da0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0ced94c71635e32f49a90b4c0c46c8343e7295dedff2957e0d7fb89091a9ad65a8804de1e38ba0a03bdf90289f90286010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba04917ae0c5d611c0eb0978092cb006ad795245789538e8438679924d7eb19b40da05c679e8c53944b60b2b039ef78c6d2f456f62a182f99d25dcf3ebb9a4d1377d0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4917ae0c5d611c0eb0978092cb006ad795245789538e8438679924d7eb19b40d",
+                        "s" : "0x5c679e8c53944b60b2b039ef78c6d2f456f62a182f99d25dcf3ebb9a4d1377d0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc7550ee677898ea96508d009b5c64f3d293f001968b5a6ef436193ec0b93336a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0.json
index fa1fd653d..9909e3945 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_37111_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0Filler.json",
-            "sourceHash" : "8dd9846bc0abd106a53a9da7bcdc55871986338cecccf97492a13753f0960bce"
+            "sourceHash" : "cb59e7c5282ca1aabb473131a504fd76bec5e8e8ac56c2b57f785de5f91b5b13"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0145d0",
-                    "hash" : "0xa2731163132e5cc0cffc909a5cd3990fc70edbf285623ccaa35f7cb6d74615bf",
-                    "mixHash" : "0xeca658a3198f46a363836ff4ff43c5d91ffd7127b43d818d171feba18be486cf",
-                    "nonce" : "0xe1b5341eaea52d22",
+                    "hash" : "0x34687ccd1cb8797face5d2b3b70dcd9f547682d7d27b2511a2ef9a325829f794",
+                    "mixHash" : "0x4b9da0b59fcc671af31292a385d45d869e6bfd939db7c2dcb29b265b864d3027",
+                    "nonce" : "0x44bd3ae8990d116a",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x91336e88fa620cb6126a4b36c4485cb8570acbf096cd4a8e29dc258399637055",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x09c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c5d0733ef11a5d9d1375c2d47a9a8422eebbbe008b9e1f00434afa0d7c0eeca8a009c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701a091336e88fa620cb6126a4b36c4485cb8570acbf096cd4a8e29dc258399637055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830145d08203e880a0eca658a3198f46a363836ff4ff43c5d91ffd7127b43d818d171feba18be486cf88e1b5341eaea52d22f90289f902860101830145d094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5a01adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332bc0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c5d0733ef11a5d9d1375c2d47a9a8422eebbbe008b9e1f00434afa0d7c0eeca8a009c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701a091336e88fa620cb6126a4b36c4485cb8570acbf096cd4a8e29dc258399637055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830145d08203e880a04b9da0b59fcc671af31292a385d45d869e6bfd939db7c2dcb29b265b864d30278844bd3ae8990d116af90289f902860101830145d094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5a01adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2731163132e5cc0cffc909a5cd3990fc70edbf285623ccaa35f7cb6d74615bf",
+        "lastblockhash" : "0x34687ccd1cb8797face5d2b3b70dcd9f547682d7d27b2511a2ef9a325829f794",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g1v0.json
index 7a73a41bf..0869da286 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g1v0Filler.json",
+            "sourceHash" : "efd5b827bb7e046fd26fa3aaeb6eda73993cdc02398ad1297b27533b4f32087b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0xbb9f3c007428b1a55bdae38445a42f337c1c91f20d1fda30e185e31f0f1a0008",
+                    "mixHash" : "0x7562594777b16563f4859bfdf2e3c4ecf9a2ebaab413d0f0ff74074b2cccba85",
+                    "nonce" : "0xee33a6c1774ef0d0",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xa74494ffc6e2bae3a7b3823e0ad12338c9d936dd591f24836e10ced7b8f72102",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9618a26e55597484122cd43b81bab4aad69a8b5ad9ffb1315eef6f06ae3164d5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a74494ffc6e2bae3a7b3823e0ad12338c9d936dd591f24836e10ced7b8f72102a09618a26e55597484122cd43b81bab4aad69a8b5ad9ffb1315eef6f06ae3164d5a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a07562594777b16563f4859bfdf2e3c4ecf9a2ebaab413d0f0ff74074b2cccba8588ee33a6c1774ef0d0f90289f90286010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca0996931929ad9c029a7bdf1ec1f35ef33ec1fe8448dcc4057d7f3b0864804cf09a0552a4cec72f3658edd9aa6418454c4af9880ede912fab7954b271696581283bac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x996931929ad9c029a7bdf1ec1f35ef33ec1fe8448dcc4057d7f3b0864804cf09",
+                        "s" : "0x552a4cec72f3658edd9aa6418454c4af9880ede912fab7954b271696581283ba",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbb9f3c007428b1a55bdae38445a42f337c1c91f20d1fda30e185e31f0f1a0008",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g2v0.json
index 7a73a41bf..4a81ed305 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g2v0Filler.json",
+            "sourceHash" : "177fc66cf486d8de5ba35ce8f2e118f30c4df3700c1121ca2a55011055520364"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x034343d52aef3cfede41b89ad6d6bd90f11bb5519c12526e1053754e75900329",
+                    "mixHash" : "0x1d24c0b784603da480aa73bc4bac761df20b61ef03c8edfbe38dc82a452a0a16",
+                    "nonce" : "0x2ce0145a02d7a5e3",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x0b5a9b608961477ca227b1172fa80f596a1caab4386fa3d683932d68e89373db",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x829bc499c948dcf28bebec909f52fd6d508a02f8e1873a9f46dce37bfde79ecd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b5a9b608961477ca227b1172fa80f596a1caab4386fa3d683932d68e89373dba0829bc499c948dcf28bebec909f52fd6d508a02f8e1873a9f46dce37bfde79ecda0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a01d24c0b784603da480aa73bc4bac761df20b61ef03c8edfbe38dc82a452a0a16882ce0145a02d7a5e3f90289f9028601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba07d44b9368ab6399496ec13c7b4a429710bb4138365759b6189a75f7dd70e27dea0661f7494627285de27c1ae3362f0f3dfbf2d4ac1a952b0ecb60bc29691e982f9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7d44b9368ab6399496ec13c7b4a429710bb4138365759b6189a75f7dd70e27de",
+                        "s" : "0x661f7494627285de27c1ae3362f0f3dfbf2d4ac1a952b0ecb60bc29691e982f9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x034343d52aef3cfede41b89ad6d6bd90f11bb5519c12526e1053754e75900329",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g3v0.json
index 7a73a41bf..132453721 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_37111_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g3v0Filler.json",
+            "sourceHash" : "0cfb8d2ff2bd9a45b178b3a7e5fa0dd674fc4d69c7d1038775f674f11c47e3e2"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x4f5750469e4cbac0e8d98d344f9db52a09990cc26058fe5884a28759b2cf0548",
+                    "mixHash" : "0xbabe55e0701a3d6afc29890daa8c385a0704f9fe5defa6eb60d3ba6359c5c1c5",
+                    "nonce" : "0xdef0c4cea3071dfa",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x00e22632313c4a064f94cbec474fb3bb935b972d72a188e1fe40c59f4b23f00f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x01d37cc549aedaee1cba2f798a0945fbd867b231c1a5bc541c4caf406138d04d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a000e22632313c4a064f94cbec474fb3bb935b972d72a188e1fe40c59f4b23f00fa001d37cc549aedaee1cba2f798a0945fbd867b231c1a5bc541c4caf406138d04da0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0babe55e0701a3d6afc29890daa8c385a0704f9fe5defa6eb60d3ba6359c5c1c588def0c4cea3071dfaf90289f90286010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba04917ae0c5d611c0eb0978092cb006ad795245789538e8438679924d7eb19b40da05c679e8c53944b60b2b039ef78c6d2f456f62a182f99d25dcf3ebb9a4d1377d0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4917ae0c5d611c0eb0978092cb006ad795245789538e8438679924d7eb19b40d",
+                        "s" : "0x5c679e8c53944b60b2b039ef78c6d2f456f62a182f99d25dcf3ebb9a4d1377d0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4f5750469e4cbac0e8d98d344f9db52a09990cc26058fe5884a28759b2cf0548",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0.json
index 75bc7bf13..e0302838c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_37120_37111_97_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0Filler.json",
             "sourceHash" : "3c1172599bad88e60af34f725f389d15be1466a3f44912d3e469f63235abe06c"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0b554e",
-                    "hash" : "0x0c87c2486de49fa1828f52f77de622e5f80c1e84069a64e882bbf40c5990adc4",
-                    "mixHash" : "0xe28a900281109d3ff248b974a40404d14149ef7a2a054a90597180897c15af74",
-                    "nonce" : "0xe2f8849173076714",
+                    "hash" : "0xd5fbd878c7d7a4636c095345e2f4646b82277265dd8d5d0aa9f94c899862a606",
+                    "mixHash" : "0xf7616471a8d10571b16c0031c69efd1dd1a3c965f6b6e7edacce4e30138d1135",
+                    "nonce" : "0x2ec79e3c23a3da51",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x3556590d36a868cddabadffce132c5d68e4b501b3d658614aaa85ca7c783c5a7",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x0473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d4508d5f3e27682f5785c3e7b57e8ac3c34f61fb6257849089036d293a6cf16ca00473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239a03556590d36a868cddabadffce132c5d68e4b501b3d658614aaa85ca7c783c5a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830b554e8203e880a0e28a900281109d3ff248b974a40404d14149ef7a2a054a90597180897c15af7488e2f8849173076714f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba0b3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8ea047dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389c0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d4508d5f3e27682f5785c3e7b57e8ac3c34f61fb6257849089036d293a6cf16ca00473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239a03556590d36a868cddabadffce132c5d68e4b501b3d658614aaa85ca7c783c5a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830b554e8203e880a0f7616471a8d10571b16c0031c69efd1dd1a3c965f6b6e7edacce4e30138d1135882ec79e3c23a3da51f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba0b3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8ea047dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0c87c2486de49fa1828f52f77de622e5f80c1e84069a64e882bbf40c5990adc4",
+        "lastblockhash" : "0xd5fbd878c7d7a4636c095345e2f4646b82277265dd8d5d0aa9f94c899862a606",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g1v0.json
index 7a73a41bf..693963599 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g1v0Filler.json",
+            "sourceHash" : "1f6c0a42f3ca7db43f2d0aa490ea2a64037440202802aa8309b8c8c931e0d240"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x1d95d71d4198ccb6d49c487fc7a57c73d1bad82f2bf5f9773d80ebe492388cf9",
+                    "mixHash" : "0xd88271bac8e5eb87685950c716282eaa9f0bfe815ec6cc9711a4a61107430023",
+                    "nonce" : "0x36077b8d6f0e9d4e",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xfcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x48529a93e454ac12ccd3f305afad41b28947d7b056a9015074cc04899e114d80",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2ea048529a93e454ac12ccd3f305afad41b28947d7b056a9015074cc04899e114d80a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0d88271bac8e5eb87685950c716282eaa9f0bfe815ec6cc9711a4a611074300238836077b8d6f0e9d4ef90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba05517d57927dc1de214f4cc74e914264deb53e91508ee220ac29c58914e952b31a00a54502aadc39aaba6983ebd614474f2f7c61a550995b9e0c9d10612bf345489c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5517d57927dc1de214f4cc74e914264deb53e91508ee220ac29c58914e952b31",
+                        "s" : "0x0a54502aadc39aaba6983ebd614474f2f7c61a550995b9e0c9d10612bf345489",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1d95d71d4198ccb6d49c487fc7a57c73d1bad82f2bf5f9773d80ebe492388cf9",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g2v0.json
index 7a73a41bf..f2275943f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g2v0Filler.json",
+            "sourceHash" : "1750149a3d868a6a3039a846d5e6ac55aeca74bb621eb4680ba7c909960f0f0d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x93ccbaeb258d4ba913e3cce96555f147e09752d65da1914f29feb5ba7e125424",
+                    "mixHash" : "0x2eb52539df915e0b056f820ae8e2c5ef05b992178dfcec486c22cce8c2c849d7",
+                    "nonce" : "0x547bb37f0e3de960",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xa658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8a6eb133d85aaa9964757980b9971c710080ad8808808f48a0300aae064183ae",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819a08a6eb133d85aaa9964757980b9971c710080ad8808808f48a0300aae064183aea0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a02eb52539df915e0b056f820ae8e2c5ef05b992178dfcec486c22cce8c2c849d788547bb37f0e3de960f90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0f4cb226318923c731c794b3879434fc3edbf770d094041ee802276516c0b5330a033e84bed6d13e0f255c58916f19f88b8dc076ba95b616095475cb7fe7d06073ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xf4cb226318923c731c794b3879434fc3edbf770d094041ee802276516c0b5330",
+                        "s" : "0x33e84bed6d13e0f255c58916f19f88b8dc076ba95b616095475cb7fe7d06073e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x93ccbaeb258d4ba913e3cce96555f147e09752d65da1914f29feb5ba7e125424",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g3v0.json
index 7a73a41bf..4e64f3538 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g3v0Filler.json",
+            "sourceHash" : "32be1350c0780a1b3aeec55c56332c61fc5b137d959713169d2c0c9e63e7eae5"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xbf3a7f10375f59287fa7083fb0a1441b93de7d13abef9005d9b3f62c1a5ffc64",
+                    "mixHash" : "0xcf5081a462655a1629393f4e6b69e0c0e0da481677aea217d7cafda73c7e9057",
+                    "nonce" : "0x805d9370d39ac9fe",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0xadd3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x16e0cf2f03174ffc8cae7b4b6bf25f1f6a0113aa75c42031919fb4cc568d52cb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0add3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50a016e0cf2f03174ffc8cae7b4b6bf25f1f6a0113aa75c42031919fb4cc568d52cba0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0cf5081a462655a1629393f4e6b69e0c0e0da481677aea217d7cafda73c7e905788805d9370d39ac9fef90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca03c9c3c419e7596c339b357cbf3091c7fdb9045ed5c12cb751ac174d2560bc9cfa017a6ba359a6d124814a6b3572bdda1711d99cca399dafb96e88190f810ae34a4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3c9c3c419e7596c339b357cbf3091c7fdb9045ed5c12cb751ac174d2560bc9cf",
+                        "s" : "0x17a6ba359a6d124814a6b3572bdda1711d99cca399dafb96e88190f810ae34a4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbf3a7f10375f59287fa7083fb0a1441b93de7d13abef9005d9b3f62c1a5ffc64",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0.json
index c9ce81f17..a5b912ed3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_97_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0Filler.json",
-            "sourceHash" : "0cb017805d26c796af9915f3343c1d761ad83ddee2c133afe658f90edc32a86e"
+            "sourceHash" : "68504e790879b7e43ca4e8915cd006578e4d069550d358956a93e8c53cee804d"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02f950",
-                    "hash" : "0x0f97adc4e0c948c51f5308320f3b1dd47b77c88ae35aa6dbe589ec18869b8cd1",
-                    "mixHash" : "0x0e5bcee68662ce487cc214f33731e9b8e9516b34ccf1fdf2ca50ff3526f3a058",
-                    "nonce" : "0x549d3e73c3ca8cf3",
+                    "hash" : "0x8d1b34b07aa09cd4baee3f8006837c4afa2ab29a9fe9d095f0a999124a39b1ba",
+                    "mixHash" : "0xbd3542703f6837a25a457642a1e4c3f0be88c54c372e3a25185a57d56c7cb5a2",
+                    "nonce" : "0x0c07fbd10aa6b167",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x39569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xb746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f5debea0cd97c5977c8a6ef287c446e551c3a50dc9c10ba4a948a76796ac8cfda0b746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728ca039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a00e5bcee68662ce487cc214f33731e9b8e9516b34ccf1fdf2ca50ff3526f3a05888549d3e73c3ca8cf3f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba03875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6a065d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35ac0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f5debea0cd97c5977c8a6ef287c446e551c3a50dc9c10ba4a948a76796ac8cfda0b746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728ca039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a0bd3542703f6837a25a457642a1e4c3f0be88c54c372e3a25185a57d56c7cb5a2880c07fbd10aa6b167f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba03875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6a065d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f97adc4e0c948c51f5308320f3b1dd47b77c88ae35aa6dbe589ec18869b8cd1",
+        "lastblockhash" : "0x8d1b34b07aa09cd4baee3f8006837c4afa2ab29a9fe9d095f0a999124a39b1ba",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g1v0.json
index 7a73a41bf..320ab1c6e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g1v0Filler.json",
+            "sourceHash" : "b0ef6c33663fe7128f5194bbb18ff31c3ff07f0873e6ef35f09b5380d5f471cb"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x3df3566d2dac288bf95230c89fc25c9deea8346c160609f6840876ef7df9f208",
+                    "mixHash" : "0x407e817105e1a155111bd0c2b3304806096a151104f48b274b9eb4aca7075265",
+                    "nonce" : "0x636b9834b9c6f94d",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xfcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x48529a93e454ac12ccd3f305afad41b28947d7b056a9015074cc04899e114d80",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2ea048529a93e454ac12ccd3f305afad41b28947d7b056a9015074cc04899e114d80a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0407e817105e1a155111bd0c2b3304806096a151104f48b274b9eb4aca707526588636b9834b9c6f94df90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba05517d57927dc1de214f4cc74e914264deb53e91508ee220ac29c58914e952b31a00a54502aadc39aaba6983ebd614474f2f7c61a550995b9e0c9d10612bf345489c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5517d57927dc1de214f4cc74e914264deb53e91508ee220ac29c58914e952b31",
+                        "s" : "0x0a54502aadc39aaba6983ebd614474f2f7c61a550995b9e0c9d10612bf345489",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3df3566d2dac288bf95230c89fc25c9deea8346c160609f6840876ef7df9f208",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g2v0.json
index 7a73a41bf..5c2276fe3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g2v0Filler.json",
+            "sourceHash" : "8e55baf9a71a36e7a129f1c012fafc809695587d47699c125ba9e4f39f8fd891"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x79e85aac6cf84b631207628e82cc03314696d5cbd16dda09b9a7b73802b47a47",
+                    "mixHash" : "0x9867c0674f26e6f4889c0be43618b37262e87a60b08dd98467410daada12d5b5",
+                    "nonce" : "0x777f7e2d78acc788",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xa658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8a6eb133d85aaa9964757980b9971c710080ad8808808f48a0300aae064183ae",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819a08a6eb133d85aaa9964757980b9971c710080ad8808808f48a0300aae064183aea0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a09867c0674f26e6f4889c0be43618b37262e87a60b08dd98467410daada12d5b588777f7e2d78acc788f90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0f4cb226318923c731c794b3879434fc3edbf770d094041ee802276516c0b5330a033e84bed6d13e0f255c58916f19f88b8dc076ba95b616095475cb7fe7d06073ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xf4cb226318923c731c794b3879434fc3edbf770d094041ee802276516c0b5330",
+                        "s" : "0x33e84bed6d13e0f255c58916f19f88b8dc076ba95b616095475cb7fe7d06073e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x79e85aac6cf84b631207628e82cc03314696d5cbd16dda09b9a7b73802b47a47",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g3v0.json
index 7a73a41bf..a9bb2f8eb 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g3v0Filler.json",
+            "sourceHash" : "a981fe1073d1440024a51d2728b483e32349b93f2e9430180d2a3cdb37118067"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xfc4808c14d27551409c606b46d34b2ba2ec36515df4a4e0d2997ed458c96f45c",
+                    "mixHash" : "0xf8590555fe9e77c0e3186ab14580858042a1ebf31d9f1982239cd197561ca051",
+                    "nonce" : "0x885bc699207ab0c6",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0xadd3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x16e0cf2f03174ffc8cae7b4b6bf25f1f6a0113aa75c42031919fb4cc568d52cb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0add3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50a016e0cf2f03174ffc8cae7b4b6bf25f1f6a0113aa75c42031919fb4cc568d52cba0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0f8590555fe9e77c0e3186ab14580858042a1ebf31d9f1982239cd197561ca05188885bc699207ab0c6f90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca03c9c3c419e7596c339b357cbf3091c7fdb9045ed5c12cb751ac174d2560bc9cfa017a6ba359a6d124814a6b3572bdda1711d99cca399dafb96e88190f810ae34a4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3c9c3c419e7596c339b357cbf3091c7fdb9045ed5c12cb751ac174d2560bc9cf",
+                        "s" : "0x17a6ba359a6d124814a6b3572bdda1711d99cca399dafb96e88190f810ae34a4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfc4808c14d27551409c606b46d34b2ba2ec36515df4a4e0d2997ed458c96f45c",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0.json
index 65af5faa8..c69b61667 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_97_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0Filler.json",
-            "sourceHash" : "080a88eafd56fbda6500ea9294aa8c291e0f3c5ca0392e492822205960d72469"
+            "sourceHash" : "c185a5760c78062a5f228859dd28482b810e69ff4ebe95ef303da591a05f571b"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0x1a315e7c6e9d82b8724d0533c84ca0a5933546d274d159d33d1c1d9d89535fe4",
-                    "mixHash" : "0x1a211f05844550aec49c0ab00b9f95da03fe6289d44bf76818037b57c530f356",
-                    "nonce" : "0x06e7849683506536",
+                    "hash" : "0x796a7f5c85ea252903131c98c62e917d2fabb65d9ae9f8fd2978dd18369d5966",
+                    "mixHash" : "0x47270e95e31079365efd25b661202dbac96ad9b250535535ecc54c4d765c535f",
+                    "nonce" : "0x0456c1ff8189d887",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0xc9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x7ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90426f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08a07b0788d0dfbcaf2f4cf11d78cc71c7a562eef37cde5198c32a4ea29563008a07ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8a0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a01a211f05844550aec49c0ab00b9f95da03fe6289d44bf76818037b57c530f3568806e7849683506536f90227f90224010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001b9fb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360a03efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88c0",
+                "rlp" : "0xf90426f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08a07b0788d0dfbcaf2f4cf11d78cc71c7a562eef37cde5198c32a4ea29563008a07ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8a0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a047270e95e31079365efd25b661202dbac96ad9b250535535ecc54c4d765c535f880456c1ff8189d887f90227f90224010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001b9fb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360a03efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a315e7c6e9d82b8724d0533c84ca0a5933546d274d159d33d1c1d9d89535fe4",
+        "lastblockhash" : "0x796a7f5c85ea252903131c98c62e917d2fabb65d9ae9f8fd2978dd18369d5966",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g1v0.json
index 7a73a41bf..fb61b2fe4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g1v0Filler.json",
+            "sourceHash" : "877e77f1712bc27a8d0cf9ad90b09ab96b1ba3a3818c4098c92e1fdb607a11ae"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0xc00e4bfd80f35ca4b1e96410db2fd278f4a3a28253ebc33a0a3dc57809edc79a",
+                    "mixHash" : "0x75abe9bd170ace4bf5e9e9dd1ce9ee17c923adb24c6cbe02ab834edd61440704",
+                    "nonce" : "0x218aece54a6b3e6e",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xfcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x48529a93e454ac12ccd3f305afad41b28947d7b056a9015074cc04899e114d80",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2ea048529a93e454ac12ccd3f305afad41b28947d7b056a9015074cc04899e114d80a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a075abe9bd170ace4bf5e9e9dd1ce9ee17c923adb24c6cbe02ab834edd6144070488218aece54a6b3e6ef90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba05517d57927dc1de214f4cc74e914264deb53e91508ee220ac29c58914e952b31a00a54502aadc39aaba6983ebd614474f2f7c61a550995b9e0c9d10612bf345489c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5517d57927dc1de214f4cc74e914264deb53e91508ee220ac29c58914e952b31",
+                        "s" : "0x0a54502aadc39aaba6983ebd614474f2f7c61a550995b9e0c9d10612bf345489",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc00e4bfd80f35ca4b1e96410db2fd278f4a3a28253ebc33a0a3dc57809edc79a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g2v0.json
index 7a73a41bf..da168289d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g2v0Filler.json",
+            "sourceHash" : "309f69455f3b59ab354cd31a14ca45e3811ecee9fc3f877cdb3fdf304867317a"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0xe726fb6bd4c1b08faf9dcafacd0ba01c0917c1b562414cbbeb9ccedf13f2242b",
+                    "mixHash" : "0xd3fb78616854d4b41df91fa6190f8adbb8587c60b9f37ecaa668156d6a462647",
+                    "nonce" : "0x6d11f407c80c51d6",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xa658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8a6eb133d85aaa9964757980b9971c710080ad8808808f48a0300aae064183ae",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819a08a6eb133d85aaa9964757980b9971c710080ad8808808f48a0300aae064183aea0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a0d3fb78616854d4b41df91fa6190f8adbb8587c60b9f37ecaa668156d6a462647886d11f407c80c51d6f90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0f4cb226318923c731c794b3879434fc3edbf770d094041ee802276516c0b5330a033e84bed6d13e0f255c58916f19f88b8dc076ba95b616095475cb7fe7d06073ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xf4cb226318923c731c794b3879434fc3edbf770d094041ee802276516c0b5330",
+                        "s" : "0x33e84bed6d13e0f255c58916f19f88b8dc076ba95b616095475cb7fe7d06073e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe726fb6bd4c1b08faf9dcafacd0ba01c0917c1b562414cbbeb9ccedf13f2242b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g3v0.json
index 7a73a41bf..4d76a48d8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g3v0Filler.json",
+            "sourceHash" : "4d14766c4dd31294e2588a676dad699b2d21d901420ffd31fb5ce631b42e08b4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xb2cbe82a7078465a8445536ed507514e64f420f74c945a0450cd50f027e39c33",
+                    "mixHash" : "0x77d6e12b15cf345cd31d8f619bdddea01b134bb297fa64b5ecdf5814515a82c7",
+                    "nonce" : "0xef021f2d7e0242da",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0xadd3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x16e0cf2f03174ffc8cae7b4b6bf25f1f6a0113aa75c42031919fb4cc568d52cb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0add3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50a016e0cf2f03174ffc8cae7b4b6bf25f1f6a0113aa75c42031919fb4cc568d52cba0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a077d6e12b15cf345cd31d8f619bdddea01b134bb297fa64b5ecdf5814515a82c788ef021f2d7e0242daf90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca03c9c3c419e7596c339b357cbf3091c7fdb9045ed5c12cb751ac174d2560bc9cfa017a6ba359a6d124814a6b3572bdda1711d99cca399dafb96e88190f810ae34a4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3c9c3c419e7596c339b357cbf3091c7fdb9045ed5c12cb751ac174d2560bc9cf",
+                        "s" : "0x17a6ba359a6d124814a6b3572bdda1711d99cca399dafb96e88190f810ae34a4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb2cbe82a7078465a8445536ed507514e64f420f74c945a0450cd50f027e39c33",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0.json
index d94d23d71..41ce3d84b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_97_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0Filler.json",
-            "sourceHash" : "7d9f4f39af2b20d927266b31c13473ec82eb3b2d90ec3437fdc71ef4c85b14e3"
+            "sourceHash" : "d9b4fa9fd58c9dc825f2ec3d3c324bd53348346a157c676b59a443b78c2beca2"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1c8",
-                    "hash" : "0x1dcb8ae184ee7a13117dd0812a424045b9748adb8cbb3d5b30c666e6ade3de0a",
-                    "mixHash" : "0x97a0eba84da9759b4a75bff2a9694bcd68c0df71fd5f6053a8ea326a1a5f7910",
-                    "nonce" : "0x246c747b94ca1062",
+                    "hash" : "0xe0af797f51b64e06eeb49803f8184d578f860712dd658e940dc56d8e162e703d",
+                    "mixHash" : "0x573eb3f3ee46c3a17c55fe1b7849ae8bb286dbffd1606e6a0c2447658c64160c",
+                    "nonce" : "0x27130b33cefaed07",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601ed",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x4f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0715bf751aac85ccf3294a7f128e486679ea0fbef05ea7683d78959457c767ca2a04f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdca0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a097a0eba84da9759b4a75bff2a9694bcd68c0df71fd5f6053a8ea326a1a5f791088246c747b94ca1062f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca07ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910a0334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505bc0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0715bf751aac85ccf3294a7f128e486679ea0fbef05ea7683d78959457c767ca2a04f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdca0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a0573eb3f3ee46c3a17c55fe1b7849ae8bb286dbffd1606e6a0c2447658c64160c8827130b33cefaed07f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca07ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910a0334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1dcb8ae184ee7a13117dd0812a424045b9748adb8cbb3d5b30c666e6ade3de0a",
+        "lastblockhash" : "0xe0af797f51b64e06eeb49803f8184d578f860712dd658e940dc56d8e162e703d",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g1v0.json
index 7a73a41bf..140a20b90 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g1v0Filler.json",
+            "sourceHash" : "06c6586dc5b10c481993a048f24d9c7f2ccb520d314f7fd174bb4d6d9fa79d57"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x26e710ec80a09a6c809af6971c5ad9887f00feb8c71c6833c7e377facfcc574b",
+                    "mixHash" : "0x3e2b2b1bb740d7af30b222ac01d204ad4d0463c3f71ce9d984fc97aa7bc4c948",
+                    "nonce" : "0x562c74ef934faa59",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xfcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x48529a93e454ac12ccd3f305afad41b28947d7b056a9015074cc04899e114d80",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2ea048529a93e454ac12ccd3f305afad41b28947d7b056a9015074cc04899e114d80a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a03e2b2b1bb740d7af30b222ac01d204ad4d0463c3f71ce9d984fc97aa7bc4c94888562c74ef934faa59f90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba05517d57927dc1de214f4cc74e914264deb53e91508ee220ac29c58914e952b31a00a54502aadc39aaba6983ebd614474f2f7c61a550995b9e0c9d10612bf345489c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5517d57927dc1de214f4cc74e914264deb53e91508ee220ac29c58914e952b31",
+                        "s" : "0x0a54502aadc39aaba6983ebd614474f2f7c61a550995b9e0c9d10612bf345489",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x26e710ec80a09a6c809af6971c5ad9887f00feb8c71c6833c7e377facfcc574b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g2v0.json
index 7a73a41bf..62357854a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g2v0Filler.json",
+            "sourceHash" : "32f5d3fb8028d0d37ec19df67b0e2950347393d448b25d342eb75208da0a1b95"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x613df52d61bb8a890f88679769e4f201859af36718f382311347874214866b48",
+                    "mixHash" : "0x09d4bac3c76e5001807f748919783f2fbc7802a89f99436ffefb141aff3ce382",
+                    "nonce" : "0x30527fd2d4d5ad68",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xa658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8a6eb133d85aaa9964757980b9971c710080ad8808808f48a0300aae064183ae",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819a08a6eb133d85aaa9964757980b9971c710080ad8808808f48a0300aae064183aea0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a009d4bac3c76e5001807f748919783f2fbc7802a89f99436ffefb141aff3ce3828830527fd2d4d5ad68f90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0f4cb226318923c731c794b3879434fc3edbf770d094041ee802276516c0b5330a033e84bed6d13e0f255c58916f19f88b8dc076ba95b616095475cb7fe7d06073ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xf4cb226318923c731c794b3879434fc3edbf770d094041ee802276516c0b5330",
+                        "s" : "0x33e84bed6d13e0f255c58916f19f88b8dc076ba95b616095475cb7fe7d06073e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x613df52d61bb8a890f88679769e4f201859af36718f382311347874214866b48",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g3v0.json
index 7a73a41bf..2577bffed 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g3v0Filler.json",
+            "sourceHash" : "8d9f83fb203c5da7813fbd770129ac60fa2b5aa6f222c619b28b1e3ed2b48afd"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x5daaa9aa4ebe8d5ba31e1894c1fd882dcc9649b22090d9482973de3730cfe0fc",
+                    "mixHash" : "0x32f013efbbd8b550c2186b05b3cdd1878ed0234f421d9dee88dda43112914ca6",
+                    "nonce" : "0xd2290a888b0d05cc",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0xadd3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x16e0cf2f03174ffc8cae7b4b6bf25f1f6a0113aa75c42031919fb4cc568d52cb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0add3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50a016e0cf2f03174ffc8cae7b4b6bf25f1f6a0113aa75c42031919fb4cc568d52cba0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a032f013efbbd8b550c2186b05b3cdd1878ed0234f421d9dee88dda43112914ca688d2290a888b0d05ccf90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca03c9c3c419e7596c339b357cbf3091c7fdb9045ed5c12cb751ac174d2560bc9cfa017a6ba359a6d124814a6b3572bdda1711d99cca399dafb96e88190f810ae34a4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3c9c3c419e7596c339b357cbf3091c7fdb9045ed5c12cb751ac174d2560bc9cf",
+                        "s" : "0x17a6ba359a6d124814a6b3572bdda1711d99cca399dafb96e88190f810ae34a4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5daaa9aa4ebe8d5ba31e1894c1fd882dcc9649b22090d9482973de3730cfe0fc",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0.json
index 4e76a1349..8053d67a5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_97_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0Filler.json",
-            "sourceHash" : "4432f4b638d86147b5fd272e278c37e1fcd5df2ef912fb7ab409121bde8f7c6f"
+            "sourceHash" : "183634f759af2f54b90d32e06ea2cb672b676d668aa7c739dcab07390bff1da0"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xfd80",
-                    "hash" : "0x1604f9e07166fcae168ee5ea56a3156545bdf19b1d8f25f794a69bc8237721f4",
-                    "mixHash" : "0x006a914943328418dfd19c32694532aa0a8717cf68fd25e0eb2130f3d497b7be",
-                    "nonce" : "0x60f1ffe130e6eadb",
+                    "hash" : "0xcd03baf181807de1bcecbe245408f9cca8b4416a4cc605ce47de526d2ce4c480",
+                    "mixHash" : "0x8cc4843127d8de0ddabf0a4362ff2abd95cd4500cde4df7e75be22e620e90432",
+                    "nonce" : "0xac305cb0f371586a",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0xf85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x4b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0da124c513195f233630f447f4d969c561755b9ff3be8a058c190119637a61f98a04b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4da0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0006a914943328418dfd19c32694532aa0a8717cf68fd25e0eb2130f3d497b7be8860f1ffe130e6eadbf90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0b1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1a0053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0da124c513195f233630f447f4d969c561755b9ff3be8a058c190119637a61f98a04b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4da0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a08cc4843127d8de0ddabf0a4362ff2abd95cd4500cde4df7e75be22e620e9043288ac305cb0f371586af90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0b1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1a0053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1604f9e07166fcae168ee5ea56a3156545bdf19b1d8f25f794a69bc8237721f4",
+        "lastblockhash" : "0xcd03baf181807de1bcecbe245408f9cca8b4416a4cc605ce47de526d2ce4c480",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g1v0.json
index 7a73a41bf..6fb21c567 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g1v0Filler.json",
+            "sourceHash" : "8ea4b289e30c030d6b186c08212f687d9346d373cf9e34373380c22153570ab9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x69a2d0dd2b3ae25af4e83deb1970bf7460d0dcd9f2eeaea8d582671e07234476",
+                    "mixHash" : "0xac2b45f7643d65148651995075c3ccd0ff7cb29061323a4a940c1042ad939b93",
+                    "nonce" : "0x4aba016ece7939e3",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xfcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x48529a93e454ac12ccd3f305afad41b28947d7b056a9015074cc04899e114d80",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2ea048529a93e454ac12ccd3f305afad41b28947d7b056a9015074cc04899e114d80a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0ac2b45f7643d65148651995075c3ccd0ff7cb29061323a4a940c1042ad939b93884aba016ece7939e3f90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba05517d57927dc1de214f4cc74e914264deb53e91508ee220ac29c58914e952b31a00a54502aadc39aaba6983ebd614474f2f7c61a550995b9e0c9d10612bf345489c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5517d57927dc1de214f4cc74e914264deb53e91508ee220ac29c58914e952b31",
+                        "s" : "0x0a54502aadc39aaba6983ebd614474f2f7c61a550995b9e0c9d10612bf345489",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x69a2d0dd2b3ae25af4e83deb1970bf7460d0dcd9f2eeaea8d582671e07234476",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g2v0.json
index 7a73a41bf..09645d814 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g2v0Filler.json",
+            "sourceHash" : "799186b28faedd346358e2b5647a7deac2f8a6505419825e899ee57b9bbde248"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x1d933911fa821568dcfc5f4719ef27259f4f5822268e179f77d17e230a77c5cd",
+                    "mixHash" : "0x0dd415deecc52f7b6bf842d0fc72946c9211eeba3112496ff55725cb2cb8d1a8",
+                    "nonce" : "0x86102ad96213dddb",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xa658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8a6eb133d85aaa9964757980b9971c710080ad8808808f48a0300aae064183ae",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819a08a6eb133d85aaa9964757980b9971c710080ad8808808f48a0300aae064183aea0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a00dd415deecc52f7b6bf842d0fc72946c9211eeba3112496ff55725cb2cb8d1a88886102ad96213dddbf90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0f4cb226318923c731c794b3879434fc3edbf770d094041ee802276516c0b5330a033e84bed6d13e0f255c58916f19f88b8dc076ba95b616095475cb7fe7d06073ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xf4cb226318923c731c794b3879434fc3edbf770d094041ee802276516c0b5330",
+                        "s" : "0x33e84bed6d13e0f255c58916f19f88b8dc076ba95b616095475cb7fe7d06073e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1d933911fa821568dcfc5f4719ef27259f4f5822268e179f77d17e230a77c5cd",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g3v0.json
index 7a73a41bf..b83865e77 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g3v0Filler.json",
+            "sourceHash" : "038f9c7fc864da6df294e1802855cc2fa2a07391dbcbe4b325f021e21c3b3159"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xbd6d5f9fea1413d85feb18e4cf03f885f879f472cd45c1e0b0a75cbb50df7933",
+                    "mixHash" : "0xa7f69b4a532d6cd4f6229ce29aee943b87aa65c0c78da1245956d51ee72f898d",
+                    "nonce" : "0x478d5ed8dd04f1d6",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0xadd3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x16e0cf2f03174ffc8cae7b4b6bf25f1f6a0113aa75c42031919fb4cc568d52cb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0add3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50a016e0cf2f03174ffc8cae7b4b6bf25f1f6a0113aa75c42031919fb4cc568d52cba0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0a7f69b4a532d6cd4f6229ce29aee943b87aa65c0c78da1245956d51ee72f898d88478d5ed8dd04f1d6f90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca03c9c3c419e7596c339b357cbf3091c7fdb9045ed5c12cb751ac174d2560bc9cfa017a6ba359a6d124814a6b3572bdda1711d99cca399dafb96e88190f810ae34a4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3c9c3c419e7596c339b357cbf3091c7fdb9045ed5c12cb751ac174d2560bc9cf",
+                        "s" : "0x17a6ba359a6d124814a6b3572bdda1711d99cca399dafb96e88190f810ae34a4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbd6d5f9fea1413d85feb18e4cf03f885f879f472cd45c1e0b0a75cbb50df7933",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0.json
index 4314274d0..5dbc4ffb2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_37120_37111_97_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0Filler.json",
-            "sourceHash" : "a4be854116432851eca9245044894e930eec26b34a35aa2009c9e1386e2430f4"
+            "sourceHash" : "445801b74f517ea35bda15fe36f489ddc966ece470c7a6a74604833ea426a68f"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x012490",
-                    "hash" : "0xde5ed6c5f31232bb374e462f3936d247b59f82fda582333d735f598f16656305",
-                    "mixHash" : "0x117d12b998e60fdc70f08db2768cda2d93ba9cee9501bf0afed4a36d819dc433",
-                    "nonce" : "0x26e8fc5f57efa9fc",
+                    "hash" : "0xee84c596b6b9228ffaf1e2a81fa06af109cf3547f4cf513cf4f6e73bf38ea365",
+                    "mixHash" : "0x6bd8d0dd062f5be03b7719557dd38ddc0ef87cf448eb4bdde0a6caab972e3ce6",
+                    "nonce" : "0xcd53be103de40a14",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0xf1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xc55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d6669fd57ad43c870d14c3a8f0ae893dd0b6c5f14dda940b10e121e03fcc73d9a0c55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddba0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0117d12b998e60fdc70f08db2768cda2d93ba9cee9501bf0afed4a36d819dc4338826e8fc5f57efa9fcf90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca001497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90ca05dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6bc0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d6669fd57ad43c870d14c3a8f0ae893dd0b6c5f14dda940b10e121e03fcc73d9a0c55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddba0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a06bd8d0dd062f5be03b7719557dd38ddc0ef87cf448eb4bdde0a6caab972e3ce688cd53be103de40a14f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca001497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90ca05dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde5ed6c5f31232bb374e462f3936d247b59f82fda582333d735f598f16656305",
+        "lastblockhash" : "0xee84c596b6b9228ffaf1e2a81fa06af109cf3547f4cf513cf4f6e73bf38ea365",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g1v0.json
index 7a73a41bf..41be4d19a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g1v0Filler.json",
+            "sourceHash" : "499a0b3d9cd5f8920c74fdd102cc6402166d0e6f5ae937b24440894ef85dfd6b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x5bc92122eb7d7fb6f5506c43861b552141daf8d713061c48523b20bfd91fd6c2",
+                    "mixHash" : "0xf5c6cd903568d6614079258343d3398a3e680ac7a195115c0d91aa91e31deb43",
+                    "nonce" : "0x1787aa95b3893665",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xfcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x48529a93e454ac12ccd3f305afad41b28947d7b056a9015074cc04899e114d80",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcf39668e800b6e78362f7db66cbdad1d03a0beddfcba724130b271fd8026d2ea048529a93e454ac12ccd3f305afad41b28947d7b056a9015074cc04899e114d80a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0f5c6cd903568d6614079258343d3398a3e680ac7a195115c0d91aa91e31deb43881787aa95b3893665f90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba05517d57927dc1de214f4cc74e914264deb53e91508ee220ac29c58914e952b31a00a54502aadc39aaba6983ebd614474f2f7c61a550995b9e0c9d10612bf345489c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5517d57927dc1de214f4cc74e914264deb53e91508ee220ac29c58914e952b31",
+                        "s" : "0x0a54502aadc39aaba6983ebd614474f2f7c61a550995b9e0c9d10612bf345489",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5bc92122eb7d7fb6f5506c43861b552141daf8d713061c48523b20bfd91fd6c2",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g2v0.json
index 7a73a41bf..66b88a79b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g2v0Filler.json",
+            "sourceHash" : "d67600e0c2c9ca770c4b319f4abe518b359daa929c586396ffc8b5dfaeff3d6c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0xa65861eda667723c84e28a0226cf57d90d7654fe47eabefbb9a7bb1a492c28e4",
+                    "mixHash" : "0x527c63b85299729792e253a0058f55207f699cfe0889220bd40c8e96572f6fea",
+                    "nonce" : "0x2358a37ea3ec81a5",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xa658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8a6eb133d85aaa9964757980b9971c710080ad8808808f48a0300aae064183ae",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a658d907b874be374bc1a21e2a042bdc752af6cc7dc55ebe207a9517af7e2819a08a6eb133d85aaa9964757980b9971c710080ad8808808f48a0300aae064183aea0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a0527c63b85299729792e253a0058f55207f699cfe0889220bd40c8e96572f6fea882358a37ea3ec81a5f90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0f4cb226318923c731c794b3879434fc3edbf770d094041ee802276516c0b5330a033e84bed6d13e0f255c58916f19f88b8dc076ba95b616095475cb7fe7d06073ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xf4cb226318923c731c794b3879434fc3edbf770d094041ee802276516c0b5330",
+                        "s" : "0x33e84bed6d13e0f255c58916f19f88b8dc076ba95b616095475cb7fe7d06073e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa65861eda667723c84e28a0226cf57d90d7654fe47eabefbb9a7bb1a492c28e4",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g3v0.json
index 7a73a41bf..20c018969 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_37120_37111_97_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g3v0Filler.json",
+            "sourceHash" : "b86f3057e341b6c828c1273643f76173040b82d4eca3e87a6d6aabbab2d6f1b6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xe916f78704cc8f6bbeb09b2f585c0149cb29eba9a0243cb8a84a736731bfb5ee",
+                    "mixHash" : "0xf5451f4e2f033e93298214f4df14c25bc434b72390fb4d8a31e01968a579ea05",
+                    "nonce" : "0x62d5853c8a1e053b",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0xadd3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x16e0cf2f03174ffc8cae7b4b6bf25f1f6a0113aa75c42031919fb4cc568d52cb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0add3e81e847ee37b3341aea999590e01f03f1b6e98584e12c40a80617d709a50a016e0cf2f03174ffc8cae7b4b6bf25f1f6a0113aa75c42031919fb4cc568d52cba0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0f5451f4e2f033e93298214f4df14c25bc434b72390fb4d8a31e01968a579ea058862d5853c8a1e053bf90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca03c9c3c419e7596c339b357cbf3091c7fdb9045ed5c12cb751ac174d2560bc9cfa017a6ba359a6d124814a6b3572bdda1711d99cca399dafb96e88190f810ae34a4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3c9c3c419e7596c339b357cbf3091c7fdb9045ed5c12cb751ac174d2560bc9cf",
+                        "s" : "0x17a6ba359a6d124814a6b3572bdda1711d99cca399dafb96e88190f810ae34a4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe916f78704cc8f6bbeb09b2f585c0149cb29eba9a0243cb8a84a736731bfb5ee",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0.json
index 2eb6620bc..86cf9b90b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_39936_1_55201_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0Filler.json",
             "sourceHash" : "e7480780874eb9ea4babf0e30f4607e3c071fa9e528dcce850f2e09436e9d2bf"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb694",
-                    "hash" : "0x0d4b4219c9e10698df7829c998c6572217274366d0482255e42943ed2b5f5d52",
-                    "mixHash" : "0x1bbef779daf50c99bc3f32920f2a13428072970a43bbb7ba19013f8dc49e98c0",
-                    "nonce" : "0x123b541f205947e6",
+                    "hash" : "0x66ce0fd3fd6024368d349c3130e6139ed0cc0b1c02327e1c54a7cfff7d57c833",
+                    "mixHash" : "0x1b2e1604cd7d2219ee45472f25edd7d375a4419407517aa776d83b273bc7b0c8",
+                    "nonce" : "0x0d443cacde9f908e",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x9d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a09d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a01bbef779daf50c99bc3f32920f2a13428072970a43bbb7ba19013f8dc49e98c088123b541f205947e6f90169f901660101830fa31894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca0c0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6a04245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19ac0",
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a09d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a01b2e1604cd7d2219ee45472f25edd7d375a4419407517aa776d83b273bc7b0c8880d443cacde9f908ef90169f901660101830fa31894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca0c0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6a04245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d4b4219c9e10698df7829c998c6572217274366d0482255e42943ed2b5f5d52",
+        "lastblockhash" : "0x66ce0fd3fd6024368d349c3130e6139ed0cc0b1c02327e1c54a7cfff7d57c833",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g1v0.json
index 7a73a41bf..b504e7d83 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g1v0Filler.json",
+            "sourceHash" : "f627ccd472fe19be99bb4094966b9698795d01fa9c09172479d8487ac59a53f2"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0x169d18b243779bc2a8d18902ba7773c2cdb866fe674ca50f39fd8dfee6138bdd",
+                    "mixHash" : "0x1f218182759018807b6b5a89924ed473b6f3ad38b8786be841e2fc2bb6021022",
+                    "nonce" : "0x0b42ddc91e42974d",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf049d829afebde9a888eb1acf0331ac13bd1bdfd8d43c314274c019afd58f37a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0f049d829afebde9a888eb1acf0331ac13bd1bdfd8d43c314274c019afd58f37aa015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a01f218182759018807b6b5a89924ed473b6f3ad38b8786be841e2fc2bb6021022880b42ddc91e42974df90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba02946fc6e5c11e1ee27d593cfa5c580b73aff2af9b4de5375e5cf1f9f49617730a00e402a918caedd55641d7cc4beb7d642388bf5c8627b4f54d6766b7746421274c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2946fc6e5c11e1ee27d593cfa5c580b73aff2af9b4de5375e5cf1f9f49617730",
+                        "s" : "0x0e402a918caedd55641d7cc4beb7d642388bf5c8627b4f54d6766b7746421274",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x169d18b243779bc2a8d18902ba7773c2cdb866fe674ca50f39fd8dfee6138bdd",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g2v0.json
index 7a73a41bf..9e92ab402 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g2v0Filler.json",
+            "sourceHash" : "745a4dd8c34c160b731a63dbb90bf7129325ae2853a4cfa73015eb9c426eb242"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0xfe3d025fd368b9e7e09b5a3b60960d2e0faee903f834da685ea9596411dc9736",
+                    "mixHash" : "0xa06a8fe824a2aae73a85fde3489d024384dd1ac3ef67dd5283ade47e0fcb489b",
+                    "nonce" : "0x3a8ddd7b13268927",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4736c69a54e5183dfbde86b27ce37b04ec8165cc03f61b3e568692efcac09cf0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a04736c69a54e5183dfbde86b27ce37b04ec8165cc03f61b3e568692efcac09cf0a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a0a06a8fe824a2aae73a85fde3489d024384dd1ac3ef67dd5283ade47e0fcb489b883a8ddd7b13268927f90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0c61dbdda0fbd50f7af7381306bf74862cf724a98c0d1adb893d06efe7ad18d98a0707374d93a44918cb72d7bbd6b59c57042fb81f4f34908e692d42ad07438fe1fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc61dbdda0fbd50f7af7381306bf74862cf724a98c0d1adb893d06efe7ad18d98",
+                        "s" : "0x707374d93a44918cb72d7bbd6b59c57042fb81f4f34908e692d42ad07438fe1f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfe3d025fd368b9e7e09b5a3b60960d2e0faee903f834da685ea9596411dc9736",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g3v0.json
index 7a73a41bf..1d206c32d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g3v0Filler.json",
+            "sourceHash" : "12eb33ad8032749368e38ae20f14b78a74a6f42e02e54f5da8eace5fe6a6118f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0x07e956ec40e4106a413b300f64a9bd70eb9fa3d97d234220003cbc941f76ffa0",
+                    "mixHash" : "0x573935d4941bdde34ea4126222c2c3f37ddbd9b7fcdcadc85ab5d46c484312ed",
+                    "nonce" : "0xd3aacfacb134f192",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa0137511dcc7756c50b3ee048356711ced291154be9e98c50bb76e37c3195858",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0a0137511dcc7756c50b3ee048356711ced291154be9e98c50bb76e37c3195858a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a0573935d4941bdde34ea4126222c2c3f37ddbd9b7fcdcadc85ab5d46c484312ed88d3aacfacb134f192f90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca09d662bf31ee1c897f0750c8bfa3fd41c6125dd526944acb0550816c73a53f2d4a0620cdd2385fc58ba7515873d051a07b5267f19d6a6cd67fab0ce79c184a4f73fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9d662bf31ee1c897f0750c8bfa3fd41c6125dd526944acb0550816c73a53f2d4",
+                        "s" : "0x620cdd2385fc58ba7515873d051a07b5267f19d6a6cd67fab0ce79c184a4f73f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x07e956ec40e4106a413b300f64a9bd70eb9fa3d97d234220003cbc941f76ffa0",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0.json
index ab845327e..f50cf26f1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_39936_1_55201_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0Filler.json",
             "sourceHash" : "7b41daccb9514021a44169f06f89dfedfdca37db1086818246b998a81e51608e"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb694",
-                    "hash" : "0x733928788d68ba01cd48097f71ccdbc114ee7d5ff697f7df261924059230ba8e",
-                    "mixHash" : "0x606a88a34dc4d8b7938a55cf110452e5ab7ff3f441db8d1c0df704d2a5e6f275",
-                    "nonce" : "0x2ded744c7d4af610",
+                    "hash" : "0x138ba0aecf8a3d98112125c83c2e9053c2766f907a878648226bd6cc8d33cebf",
+                    "mixHash" : "0xc15fcd9cdcf710ac25b1dc1d1e0ebb4a675a377ae4d45dae582dc54d8583763c",
+                    "nonce" : "0xb00d2839398ce8bf",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x97ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a097ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3da015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a0606a88a34dc4d8b7938a55cf110452e5ab7ff3f441db8d1c0df704d2a5e6f275882ded744c7d4af610f90169f9016601018302be5094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0dc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435aea07ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defcc0",
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a097ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3da015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a0c15fcd9cdcf710ac25b1dc1d1e0ebb4a675a377ae4d45dae582dc54d8583763c88b00d2839398ce8bff90169f9016601018302be5094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0dc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435aea07ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defcc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x733928788d68ba01cd48097f71ccdbc114ee7d5ff697f7df261924059230ba8e",
+        "lastblockhash" : "0x138ba0aecf8a3d98112125c83c2e9053c2766f907a878648226bd6cc8d33cebf",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g1v0.json
index 7a73a41bf..1b9f5c250 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g1v0Filler.json",
+            "sourceHash" : "f002c5f87defdcd51559d53a6e40db015d3e3341ed87f85f123e29be7132f731"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0xb66b46e7b1907ed8a4b046908a260339415bfa58fc044616c128053abc197be4",
+                    "mixHash" : "0x6dfbe72a27d2bd1a571c3c118873187514e3557d04fc176fcaded0d47ee6287f",
+                    "nonce" : "0xc95982dfba04aaa8",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf049d829afebde9a888eb1acf0331ac13bd1bdfd8d43c314274c019afd58f37a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0f049d829afebde9a888eb1acf0331ac13bd1bdfd8d43c314274c019afd58f37aa015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a06dfbe72a27d2bd1a571c3c118873187514e3557d04fc176fcaded0d47ee6287f88c95982dfba04aaa8f90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba02946fc6e5c11e1ee27d593cfa5c580b73aff2af9b4de5375e5cf1f9f49617730a00e402a918caedd55641d7cc4beb7d642388bf5c8627b4f54d6766b7746421274c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2946fc6e5c11e1ee27d593cfa5c580b73aff2af9b4de5375e5cf1f9f49617730",
+                        "s" : "0x0e402a918caedd55641d7cc4beb7d642388bf5c8627b4f54d6766b7746421274",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb66b46e7b1907ed8a4b046908a260339415bfa58fc044616c128053abc197be4",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g2v0.json
index 7a73a41bf..2f3c08fb4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g2v0Filler.json",
+            "sourceHash" : "f4e99411e8b54df403f933159f5b54bc2ab224c6a205c861c5c3a67f47980510"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0x1a6976b96db7272ce80801c898eb34886c63a400165d8d6692c79fc50c93ebd6",
+                    "mixHash" : "0x2e4ed63aefe50bbf954669b558a47e55eac47fb60868bceb32d85ce39fb6d92c",
+                    "nonce" : "0xd5a14d068421a54c",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4736c69a54e5183dfbde86b27ce37b04ec8165cc03f61b3e568692efcac09cf0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a04736c69a54e5183dfbde86b27ce37b04ec8165cc03f61b3e568692efcac09cf0a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a02e4ed63aefe50bbf954669b558a47e55eac47fb60868bceb32d85ce39fb6d92c88d5a14d068421a54cf90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0c61dbdda0fbd50f7af7381306bf74862cf724a98c0d1adb893d06efe7ad18d98a0707374d93a44918cb72d7bbd6b59c57042fb81f4f34908e692d42ad07438fe1fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc61dbdda0fbd50f7af7381306bf74862cf724a98c0d1adb893d06efe7ad18d98",
+                        "s" : "0x707374d93a44918cb72d7bbd6b59c57042fb81f4f34908e692d42ad07438fe1f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1a6976b96db7272ce80801c898eb34886c63a400165d8d6692c79fc50c93ebd6",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g3v0.json
index 7a73a41bf..992033fd6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g3v0Filler.json",
+            "sourceHash" : "5690a2852b81d1b4e3b18b0e3bb8bae1b107cc13cf8ef444763e6b834a2453db"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0x415f645336c47c9ffe02414adc47a5213647c2ecc19c63b447edfd70c235dd55",
+                    "mixHash" : "0xfa83bb44fd8b093ad44f17d76d396344caec303207bffff29daea71046bbfa09",
+                    "nonce" : "0x75313cb66cc3bd9d",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa0137511dcc7756c50b3ee048356711ced291154be9e98c50bb76e37c3195858",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0a0137511dcc7756c50b3ee048356711ced291154be9e98c50bb76e37c3195858a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a0fa83bb44fd8b093ad44f17d76d396344caec303207bffff29daea71046bbfa098875313cb66cc3bd9df90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca09d662bf31ee1c897f0750c8bfa3fd41c6125dd526944acb0550816c73a53f2d4a0620cdd2385fc58ba7515873d051a07b5267f19d6a6cd67fab0ce79c184a4f73fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9d662bf31ee1c897f0750c8bfa3fd41c6125dd526944acb0550816c73a53f2d4",
+                        "s" : "0x620cdd2385fc58ba7515873d051a07b5267f19d6a6cd67fab0ce79c184a4f73f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x415f645336c47c9ffe02414adc47a5213647c2ecc19c63b447edfd70c235dd55",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0.json
index 032dfff74..33c1ebb8d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_39936_1_55201_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0Filler.json",
             "sourceHash" : "fb9aaf48794412a46a876899c12f5e48245366f2b8e6dbeb1c33a4f7179a180e"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb0ec",
-                    "hash" : "0x03dbea20c366974c769a37282547ed2859c3a9b2f0cd2c551c54209729f1a6c5",
-                    "mixHash" : "0x1e6fd6bb25e1d529b0c17c5cfa510e2540dc61c59a4eedafde1b67f7df79e69f",
-                    "nonce" : "0x94c15466664699e4",
+                    "hash" : "0xc1df46148bf63b9174dfa104ae6772b94ba66dd5e8ed27aba7e6bc7a8107be96",
+                    "mixHash" : "0x3805c884fc5a3cc529d78fc5cf99167f10e1dd677fb1369110245ca8013a55d0",
+                    "nonce" : "0xf5bdc52144977c33",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0xb26eef388d1a44ec4ead9c454c6424a235c8d995d778462e4ed234c55ecf0ca9",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xd9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fdfcd87f99fb9a9ac8f4dcb8305de2cf010771a98b7e9a02ca94dad9fe9a6da1a0d9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244a0b26eef388d1a44ec4ead9c454c6424a235c8d995d778462e4ed234c55ecf0ca9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b0ec8203e880a01e6fd6bb25e1d529b0c17c5cfa510e2540dc61c59a4eedafde1b67f7df79e69f8894c15466664699e4f90168f90165010182b0ec94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0a32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5a0449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fdfcd87f99fb9a9ac8f4dcb8305de2cf010771a98b7e9a02ca94dad9fe9a6da1a0d9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244a0b26eef388d1a44ec4ead9c454c6424a235c8d995d778462e4ed234c55ecf0ca9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b0ec8203e880a03805c884fc5a3cc529d78fc5cf99167f10e1dd677fb1369110245ca8013a55d088f5bdc52144977c33f90168f90165010182b0ec94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0a32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5a0449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x03dbea20c366974c769a37282547ed2859c3a9b2f0cd2c551c54209729f1a6c5",
+        "lastblockhash" : "0xc1df46148bf63b9174dfa104ae6772b94ba66dd5e8ed27aba7e6bc7a8107be96",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g1v0.json
index 7a73a41bf..70eb9ab9a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g1v0Filler.json",
+            "sourceHash" : "9095383a0e1d1defeb28a26aaaab62e5a32400707a42a113cd5c0d7cb52e097c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0xef635ce9709c2664ba56b85886850e356f58767e9d91662ef12dc08c0f5b842c",
+                    "mixHash" : "0x7b35f7b87dda1bd742ff2a6ce5bda60d047b49ceaf4e0e4e8f79e99629f50c9e",
+                    "nonce" : "0xd720f55a5a92426e",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf049d829afebde9a888eb1acf0331ac13bd1bdfd8d43c314274c019afd58f37a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0f049d829afebde9a888eb1acf0331ac13bd1bdfd8d43c314274c019afd58f37aa015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a07b35f7b87dda1bd742ff2a6ce5bda60d047b49ceaf4e0e4e8f79e99629f50c9e88d720f55a5a92426ef90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba02946fc6e5c11e1ee27d593cfa5c580b73aff2af9b4de5375e5cf1f9f49617730a00e402a918caedd55641d7cc4beb7d642388bf5c8627b4f54d6766b7746421274c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2946fc6e5c11e1ee27d593cfa5c580b73aff2af9b4de5375e5cf1f9f49617730",
+                        "s" : "0x0e402a918caedd55641d7cc4beb7d642388bf5c8627b4f54d6766b7746421274",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xef635ce9709c2664ba56b85886850e356f58767e9d91662ef12dc08c0f5b842c",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g2v0.json
index 7a73a41bf..3cf0dd669 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g2v0Filler.json",
+            "sourceHash" : "91e8beb595e4f754da56646ccc38ddb99baa0996f5c40b67c5783db5663dc141"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0xe74aec1b33d752c13ef6a499405b3e4086df9293aac394e93ffdd218dd25370f",
+                    "mixHash" : "0x56392e291383ee8ff1b38aa9a01cc96e68b4f5b55233feace388d9e557ea0191",
+                    "nonce" : "0x945da093a7352b34",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4736c69a54e5183dfbde86b27ce37b04ec8165cc03f61b3e568692efcac09cf0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a04736c69a54e5183dfbde86b27ce37b04ec8165cc03f61b3e568692efcac09cf0a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a056392e291383ee8ff1b38aa9a01cc96e68b4f5b55233feace388d9e557ea019188945da093a7352b34f90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0c61dbdda0fbd50f7af7381306bf74862cf724a98c0d1adb893d06efe7ad18d98a0707374d93a44918cb72d7bbd6b59c57042fb81f4f34908e692d42ad07438fe1fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc61dbdda0fbd50f7af7381306bf74862cf724a98c0d1adb893d06efe7ad18d98",
+                        "s" : "0x707374d93a44918cb72d7bbd6b59c57042fb81f4f34908e692d42ad07438fe1f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe74aec1b33d752c13ef6a499405b3e4086df9293aac394e93ffdd218dd25370f",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g3v0.json
index 7a73a41bf..8b99fd9b4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g3v0Filler.json",
+            "sourceHash" : "8f5dd00783f7557c9f2d29196877073a52e79fe641b8cb13a2e476947008931a"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0x4aa997f0d7ff777437515b8402e9a2dbf5854611c5a2e82b4b1bb0e34fb7eefc",
+                    "mixHash" : "0xbc8a22335c08c40487f2e405ab16872a366ece4eb0be8029eb5446a1402899e6",
+                    "nonce" : "0xca0fe79a0f2c626b",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa0137511dcc7756c50b3ee048356711ced291154be9e98c50bb76e37c3195858",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0a0137511dcc7756c50b3ee048356711ced291154be9e98c50bb76e37c3195858a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a0bc8a22335c08c40487f2e405ab16872a366ece4eb0be8029eb5446a1402899e688ca0fe79a0f2c626bf90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca09d662bf31ee1c897f0750c8bfa3fd41c6125dd526944acb0550816c73a53f2d4a0620cdd2385fc58ba7515873d051a07b5267f19d6a6cd67fab0ce79c184a4f73fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9d662bf31ee1c897f0750c8bfa3fd41c6125dd526944acb0550816c73a53f2d4",
+                        "s" : "0x620cdd2385fc58ba7515873d051a07b5267f19d6a6cd67fab0ce79c184a4f73f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4aa997f0d7ff777437515b8402e9a2dbf5854611c5a2e82b4b1bb0e34fb7eefc",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0.json
index 5019ede8f..01caf0895 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_39936_1_55201_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0Filler.json",
             "sourceHash" : "25575e34a86e8290dd66ead83b6f5b1c927184af0d48028f366193e4834d13fc"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb694",
-                    "hash" : "0x103921a1fd50776bdc8723e9a11112f6436594f716b29441620b8ad6ed9e4ce7",
-                    "mixHash" : "0xe4c29a4c0351ecfda6f98437e8f01be5cf44b1cb68154a1aeda7aff8c08ca4a9",
-                    "nonce" : "0x9924b7c37f8f8bd4",
+                    "hash" : "0x60c16ad5406e683a6085a4a0fa09d46fe3484df3813a82fa16f7091665d96a5e",
+                    "mixHash" : "0x53ee0004a316dddfba1ed50c3bbc75d335b1e68268579a8e1f92c0f20fd7f763",
+                    "nonce" : "0x3ab8d22aa0f4132e",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x9b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a09b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917ba015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a0e4c29a4c0351ecfda6f98437e8f01be5cf44b1cb68154a1aeda7aff8c08ca4a9889924b7c37f8f8bd4f90168f90165010182b6c894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba065d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3a04bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a09b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917ba015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a053ee0004a316dddfba1ed50c3bbc75d335b1e68268579a8e1f92c0f20fd7f763883ab8d22aa0f4132ef90168f90165010182b6c894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba065d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3a04bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x103921a1fd50776bdc8723e9a11112f6436594f716b29441620b8ad6ed9e4ce7",
+        "lastblockhash" : "0x60c16ad5406e683a6085a4a0fa09d46fe3484df3813a82fa16f7091665d96a5e",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g1v0.json
index 7a73a41bf..faefcdd0a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g1v0Filler.json",
+            "sourceHash" : "2361f6b0c8e5c2032746e2841ac883b71c67b035ef5fca22cb0719fef7c856d9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0xb7ae0546c7d09db658ad0fb8f6d663da2cf64157c0a187fe262ec8955732c536",
+                    "mixHash" : "0x049e7c7c96dd635810c8d4a0051014e1e605bd45db5e6775b91967370a78a3ef",
+                    "nonce" : "0x4d17b85e26daafbd",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf049d829afebde9a888eb1acf0331ac13bd1bdfd8d43c314274c019afd58f37a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0f049d829afebde9a888eb1acf0331ac13bd1bdfd8d43c314274c019afd58f37aa015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a0049e7c7c96dd635810c8d4a0051014e1e605bd45db5e6775b91967370a78a3ef884d17b85e26daafbdf90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba02946fc6e5c11e1ee27d593cfa5c580b73aff2af9b4de5375e5cf1f9f49617730a00e402a918caedd55641d7cc4beb7d642388bf5c8627b4f54d6766b7746421274c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2946fc6e5c11e1ee27d593cfa5c580b73aff2af9b4de5375e5cf1f9f49617730",
+                        "s" : "0x0e402a918caedd55641d7cc4beb7d642388bf5c8627b4f54d6766b7746421274",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb7ae0546c7d09db658ad0fb8f6d663da2cf64157c0a187fe262ec8955732c536",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g2v0.json
index 7a73a41bf..4726050db 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g2v0Filler.json",
+            "sourceHash" : "0385bec84595e955b0ecbdaa6895476ad04452f49b28fb52f90357316aab10ca"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0x4864e9513bfa252809934567153c0d29815b9812d6c852404db9346b6bbd9741",
+                    "mixHash" : "0x55e57926fc13b9e80957b22767217e19a3929ac73b90e201c26599c3661b9373",
+                    "nonce" : "0xfe29e4521c3ce03a",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4736c69a54e5183dfbde86b27ce37b04ec8165cc03f61b3e568692efcac09cf0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a04736c69a54e5183dfbde86b27ce37b04ec8165cc03f61b3e568692efcac09cf0a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a055e57926fc13b9e80957b22767217e19a3929ac73b90e201c26599c3661b937388fe29e4521c3ce03af90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0c61dbdda0fbd50f7af7381306bf74862cf724a98c0d1adb893d06efe7ad18d98a0707374d93a44918cb72d7bbd6b59c57042fb81f4f34908e692d42ad07438fe1fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc61dbdda0fbd50f7af7381306bf74862cf724a98c0d1adb893d06efe7ad18d98",
+                        "s" : "0x707374d93a44918cb72d7bbd6b59c57042fb81f4f34908e692d42ad07438fe1f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4864e9513bfa252809934567153c0d29815b9812d6c852404db9346b6bbd9741",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g3v0.json
index 7a73a41bf..ef90ce997 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g3v0Filler.json",
+            "sourceHash" : "1bb3e33db438493d6874b3905286dc4fdf63e23e5c1be92d26507b4d758345bc"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0x092d4dc363659a17cff6cf416bc3b5e338103e8ebf3e9e57d292b05def9bc411",
+                    "mixHash" : "0x107e7aec356ab8823f20a20fecc12989199ceda3d6450dae186b0ddbd7f27225",
+                    "nonce" : "0xa23306c5f42c8e4a",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa0137511dcc7756c50b3ee048356711ced291154be9e98c50bb76e37c3195858",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0a0137511dcc7756c50b3ee048356711ced291154be9e98c50bb76e37c3195858a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a0107e7aec356ab8823f20a20fecc12989199ceda3d6450dae186b0ddbd7f2722588a23306c5f42c8e4af90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca09d662bf31ee1c897f0750c8bfa3fd41c6125dd526944acb0550816c73a53f2d4a0620cdd2385fc58ba7515873d051a07b5267f19d6a6cd67fab0ce79c184a4f73fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9d662bf31ee1c897f0750c8bfa3fd41c6125dd526944acb0550816c73a53f2d4",
+                        "s" : "0x620cdd2385fc58ba7515873d051a07b5267f19d6a6cd67fab0ce79c184a4f73f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x092d4dc363659a17cff6cf416bc3b5e338103e8ebf3e9e57d292b05def9bc411",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0.json
index d801ce80f..b3d81b983 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_39936_1_55201_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0Filler.json",
             "sourceHash" : "eacff43225221ac0f3604986343d79069bf9687b4e1c47904c41e3eb20869bdc"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb694",
-                    "hash" : "0xdfee5139c3e5a301861ab1af3a69f965488255e90ed1b586cc605f45d6ca1627",
-                    "mixHash" : "0xf2f4de2cdb45e1430fc0b9c657e6631464418d9506ae9a17aa67bee2e010b2a9",
-                    "nonce" : "0xb9d574bc414c3054",
+                    "hash" : "0xb8084a8ffb0d6631d172dfa4392de7253795f8da8af82b00da36dba1c8398c39",
+                    "mixHash" : "0xfbcf1d828b2001c5b7d97e797207f6b1b56a8602954ce048be4e685d2b42c72e",
+                    "nonce" : "0x250dc6e544405599",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0ce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a0f2f4de2cdb45e1430fc0b9c657e6631464418d9506ae9a17aa67bee2e010b2a988b9d574bc414c3054f90168f90165010182c28094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca05416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492ba065235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0ce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a0fbcf1d828b2001c5b7d97e797207f6b1b56a8602954ce048be4e685d2b42c72e88250dc6e544405599f90168f90165010182c28094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca05416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492ba065235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdfee5139c3e5a301861ab1af3a69f965488255e90ed1b586cc605f45d6ca1627",
+        "lastblockhash" : "0xb8084a8ffb0d6631d172dfa4392de7253795f8da8af82b00da36dba1c8398c39",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g1v0.json
index 7a73a41bf..2c01845a0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g1v0Filler.json",
+            "sourceHash" : "d8e946ca7743e09d0ae14853f6364298d1ce48f48153fe94419063fdeb9aa07c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0x0ccc9405316819117fd4cd323eb64f1015e0cdbbe12ad1c8588fe1c0607afebe",
+                    "mixHash" : "0x9b352328c8fd40c6c7d9d6b79a0e16b86f1324c080b020013a5a458fcf276b38",
+                    "nonce" : "0x64bde4a1d6e34c1a",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf049d829afebde9a888eb1acf0331ac13bd1bdfd8d43c314274c019afd58f37a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0f049d829afebde9a888eb1acf0331ac13bd1bdfd8d43c314274c019afd58f37aa015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a09b352328c8fd40c6c7d9d6b79a0e16b86f1324c080b020013a5a458fcf276b388864bde4a1d6e34c1af90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba02946fc6e5c11e1ee27d593cfa5c580b73aff2af9b4de5375e5cf1f9f49617730a00e402a918caedd55641d7cc4beb7d642388bf5c8627b4f54d6766b7746421274c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2946fc6e5c11e1ee27d593cfa5c580b73aff2af9b4de5375e5cf1f9f49617730",
+                        "s" : "0x0e402a918caedd55641d7cc4beb7d642388bf5c8627b4f54d6766b7746421274",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0ccc9405316819117fd4cd323eb64f1015e0cdbbe12ad1c8588fe1c0607afebe",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g2v0.json
index 7a73a41bf..d362992ae 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g2v0Filler.json",
+            "sourceHash" : "a59969916ba890503566733f5c8dd8dd2edbd9b2c203763b8d45fb9bbaa5c8a3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0x646dc969c7028b966b8242c23917d5827f528be69ec631957e4f23332bb39185",
+                    "mixHash" : "0x8bb4da73341419b748ccc9c5e0655134474421aa43ff5c522f04ccbd433c0ded",
+                    "nonce" : "0x64503e0d8666fd9c",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4736c69a54e5183dfbde86b27ce37b04ec8165cc03f61b3e568692efcac09cf0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a04736c69a54e5183dfbde86b27ce37b04ec8165cc03f61b3e568692efcac09cf0a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a08bb4da73341419b748ccc9c5e0655134474421aa43ff5c522f04ccbd433c0ded8864503e0d8666fd9cf90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0c61dbdda0fbd50f7af7381306bf74862cf724a98c0d1adb893d06efe7ad18d98a0707374d93a44918cb72d7bbd6b59c57042fb81f4f34908e692d42ad07438fe1fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc61dbdda0fbd50f7af7381306bf74862cf724a98c0d1adb893d06efe7ad18d98",
+                        "s" : "0x707374d93a44918cb72d7bbd6b59c57042fb81f4f34908e692d42ad07438fe1f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x646dc969c7028b966b8242c23917d5827f528be69ec631957e4f23332bb39185",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g3v0.json
index 7a73a41bf..4735d5931 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g3v0Filler.json",
+            "sourceHash" : "f3a6e25adcd2544383b7c823e725ae5976a6ae43267152270f642c94a9d0ba93"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0xf873ae4a2c47e7161f9203b1daf6a42df543035a55ca5e727e2a9472d2daf0f7",
+                    "mixHash" : "0x8cd18349b14b350ba75578bd5609d567feed1b2847eeb1c2a9aaa972d3e42532",
+                    "nonce" : "0x526d41221225e044",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa0137511dcc7756c50b3ee048356711ced291154be9e98c50bb76e37c3195858",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0a0137511dcc7756c50b3ee048356711ced291154be9e98c50bb76e37c3195858a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a08cd18349b14b350ba75578bd5609d567feed1b2847eeb1c2a9aaa972d3e4253288526d41221225e044f90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca09d662bf31ee1c897f0750c8bfa3fd41c6125dd526944acb0550816c73a53f2d4a0620cdd2385fc58ba7515873d051a07b5267f19d6a6cd67fab0ce79c184a4f73fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9d662bf31ee1c897f0750c8bfa3fd41c6125dd526944acb0550816c73a53f2d4",
+                        "s" : "0x620cdd2385fc58ba7515873d051a07b5267f19d6a6cd67fab0ce79c184a4f73f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf873ae4a2c47e7161f9203b1daf6a42df543035a55ca5e727e2a9472d2daf0f7",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0.json
index fd6041a59..d050cd749 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_39936_1_55201_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0Filler.json",
             "sourceHash" : "cd5f64c4519ec8afc2af59dfbb9402474ed995e4e36d331e8d5012771871fc39"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb694",
-                    "hash" : "0xe3c910d052adca1de851f782d760efc0936cb10ba35b3bcf07d2ac99b1c8e35e",
-                    "mixHash" : "0x3804ab755ffcca30ebf8dc17c85d5ad477972222c49c2570c4ace1b7793a822b",
-                    "nonce" : "0x0324c56fb66f5a41",
+                    "hash" : "0x00f8948524c6bc972fbd5c10707be7feed04942461126d24a3cb45bf26872b7c",
+                    "mixHash" : "0x3c490dfb4f5b812a38439daf1bfb85c7a019900ebe2fbe5b5cf1c23f65f51f45",
+                    "nonce" : "0x2cc406599e6f29e9",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xb58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0b58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a03804ab755ffcca30ebf8dc17c85d5ad477972222c49c2570c4ace1b7793a822b880324c56fb66f5a41f90168f90165010182e99094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca07e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8a00d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8dc0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0b58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a03c490dfb4f5b812a38439daf1bfb85c7a019900ebe2fbe5b5cf1c23f65f51f45882cc406599e6f29e9f90168f90165010182e99094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca07e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8a00d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe3c910d052adca1de851f782d760efc0936cb10ba35b3bcf07d2ac99b1c8e35e",
+        "lastblockhash" : "0x00f8948524c6bc972fbd5c10707be7feed04942461126d24a3cb45bf26872b7c",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g1v0.json
index 7a73a41bf..7a2b16c96 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g1v0Filler.json",
+            "sourceHash" : "6e687f3ec02fcc4479750d6825f320165439e7e4bd6c3b3c097de4912efb038d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0x62a6ed9ac1d6630e9817e89c4b15b5071ef46e4a27393c4f197835d6e0e2078d",
+                    "mixHash" : "0x05a5efe23d4d83af63c468f21d57da511eeb963445157cb3b48f422e19ae8aa3",
+                    "nonce" : "0xf7e227e041b1a0c1",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf049d829afebde9a888eb1acf0331ac13bd1bdfd8d43c314274c019afd58f37a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0f049d829afebde9a888eb1acf0331ac13bd1bdfd8d43c314274c019afd58f37aa015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a005a5efe23d4d83af63c468f21d57da511eeb963445157cb3b48f422e19ae8aa388f7e227e041b1a0c1f90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba02946fc6e5c11e1ee27d593cfa5c580b73aff2af9b4de5375e5cf1f9f49617730a00e402a918caedd55641d7cc4beb7d642388bf5c8627b4f54d6766b7746421274c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2946fc6e5c11e1ee27d593cfa5c580b73aff2af9b4de5375e5cf1f9f49617730",
+                        "s" : "0x0e402a918caedd55641d7cc4beb7d642388bf5c8627b4f54d6766b7746421274",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x62a6ed9ac1d6630e9817e89c4b15b5071ef46e4a27393c4f197835d6e0e2078d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g2v0.json
index 7a73a41bf..08c7f6d0f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g2v0Filler.json",
+            "sourceHash" : "e3c52e2d891ef5692e61a40ef0462d122b7a83223b69bebe514531b216d069f4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0xbf48aa65f407dddb45e3842f9b1a07d08e446c4d8428b30e0747f6e88086bf88",
+                    "mixHash" : "0x82931359fbc5a4d84ac204bd57d7b471317bf15d5304739fdcd5839c46b8db70",
+                    "nonce" : "0x844446ea54ae3382",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4736c69a54e5183dfbde86b27ce37b04ec8165cc03f61b3e568692efcac09cf0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a04736c69a54e5183dfbde86b27ce37b04ec8165cc03f61b3e568692efcac09cf0a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a082931359fbc5a4d84ac204bd57d7b471317bf15d5304739fdcd5839c46b8db7088844446ea54ae3382f90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0c61dbdda0fbd50f7af7381306bf74862cf724a98c0d1adb893d06efe7ad18d98a0707374d93a44918cb72d7bbd6b59c57042fb81f4f34908e692d42ad07438fe1fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc61dbdda0fbd50f7af7381306bf74862cf724a98c0d1adb893d06efe7ad18d98",
+                        "s" : "0x707374d93a44918cb72d7bbd6b59c57042fb81f4f34908e692d42ad07438fe1f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbf48aa65f407dddb45e3842f9b1a07d08e446c4d8428b30e0747f6e88086bf88",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g3v0.json
index 7a73a41bf..afcd0aefa 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_39936_1_55201_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g3v0Filler.json",
+            "sourceHash" : "7ad9a76001cc5c9116477360a66eafe443fbc5ca021f3c63f378c653672b46c1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb694",
+                    "hash" : "0x3c42d3f45b1b90512081e5b9f07b5406e1345b0e40938ed7d205ec02039d76d0",
+                    "mixHash" : "0x3b42b5bd013046a8f4c3b9186e4ec77196c8c998f5ca730d0bf16098bad908f7",
+                    "nonce" : "0x78816ecba9ac63aa",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x15385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511",
+                    "stateRoot" : "0xe7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa0137511dcc7756c50b3ee048356711ced291154be9e98c50bb76e37c3195858",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7d785fc60374abda80b0ddda54e02b60b90559a63418769c6fa3a0d22fef417a0a0137511dcc7756c50b3ee048356711ced291154be9e98c50bb76e37c3195858a015385a3f0057a35cb2ccc07fcccc37142c68659c14b95aea132b189e2e932511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6948203e880a03b42b5bd013046a8f4c3b9186e4ec77196c8c998f5ca730d0bf16098bad908f78878816ecba9ac63aaf90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca09d662bf31ee1c897f0750c8bfa3fd41c6125dd526944acb0550816c73a53f2d4a0620cdd2385fc58ba7515873d051a07b5267f19d6a6cd67fab0ce79c184a4f73fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9d662bf31ee1c897f0750c8bfa3fd41c6125dd526944acb0550816c73a53f2d4",
+                        "s" : "0x620cdd2385fc58ba7515873d051a07b5267f19d6a6cd67fab0ce79c184a4f73f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3c42d3f45b1b90512081e5b9f07b5406e1345b0e40938ed7d205ec02039d76d0",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761477e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0.json
index 450f6dd22..8124cd2dd 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_3_09984_39936_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0Filler.json",
             "sourceHash" : "9293e12a1c3cb25612ea8b45a5e79b2a71e1d996562151a317e444fa3a83a808"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe4b3",
-                    "hash" : "0x0187fde9636baea181be4c0ef8b3877cafa63bbea2222a61cfc539b4c709c84c",
-                    "mixHash" : "0xf557bd7f8cc61d83cb33f2165dff56ab5795b150b01b1758bd5499d43ac11752",
-                    "nonce" : "0x4895bb0d74424fbf",
+                    "hash" : "0x7835accf4fd9190a77b35555d30c3cc4e650ddb9b3671ce9343d6985526a208a",
+                    "mixHash" : "0x01bde7c4707ecefd09731b6fd91bb8729ba83a7b24a4e8d1f47378ef522008ad",
+                    "nonce" : "0x99a1c81439db6295",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x0dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca00dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6ea0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0f557bd7f8cc61d83cb33f2165dff56ab5795b150b01b1758bd5499d43ac11752884895bb0d74424fbff90169f901660101830f9b5894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57ca0468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5ac0",
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca00dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6ea0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a001bde7c4707ecefd09731b6fd91bb8729ba83a7b24a4e8d1f47378ef522008ad8899a1c81439db6295f90169f901660101830f9b5894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57ca0468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0187fde9636baea181be4c0ef8b3877cafa63bbea2222a61cfc539b4c709c84c",
+        "lastblockhash" : "0x7835accf4fd9190a77b35555d30c3cc4e650ddb9b3671ce9343d6985526a208a",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g1v0.json
index 7a73a41bf..dfca6b203 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g1v0Filler.json",
+            "sourceHash" : "cf2ae9c19d37b11776ae65497765d3ba61f92e7a3ad2cd987de88259d9450ddc"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0x6f5acbe7bfccdf2e13f59c6d9232525a999fdf16828bdeef78eeb50d52e2efb1",
+                    "mixHash" : "0xe5d8847e15c4706f284a22c2fb0e4ca3eb950445cce4752ee778b108e5b62456",
+                    "nonce" : "0x7508b6fb081f540e",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5493af43864cf61f3bd5843aec7adc1466be63e2aa57c7b6616bdfecbd21e0d3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca05493af43864cf61f3bd5843aec7adc1466be63e2aa57c7b6616bdfecbd21e0d3a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0e5d8847e15c4706f284a22c2fb0e4ca3eb950445cce4752ee778b108e5b62456887508b6fb081f540ef90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bc40b0f2538b760c5900aae073cac0b78204089c8a2167ee8a6583f2f1e8baeca02581e0b84c16c094b63838cf5c5978bd2c4adc281b086b01ca7a4a11c2c509bbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbc40b0f2538b760c5900aae073cac0b78204089c8a2167ee8a6583f2f1e8baec",
+                        "s" : "0x2581e0b84c16c094b63838cf5c5978bd2c4adc281b086b01ca7a4a11c2c509bb",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6f5acbe7bfccdf2e13f59c6d9232525a999fdf16828bdeef78eeb50d52e2efb1",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g2v0.json
index 7a73a41bf..1166809c5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g2v0Filler.json",
+            "sourceHash" : "c18855fa647305dc9d58930cacd2c78dc83ef2af3db1aab4fa7bfeee3ed57802"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0xad96dc2596c45ff756e0600c7146d70d42a7add9082f2ae39a9e2553861c1965",
+                    "mixHash" : "0xc0e0e486d3e53e69a0c55435b87788933b4728c92383838a4b875ed17d9772ee",
+                    "nonce" : "0x17ac297979b94c7f",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea62114d7d0bd7f5dc2d07b64996f26db0048b19cf66859b94dbd5e60a27a823",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0ea62114d7d0bd7f5dc2d07b64996f26db0048b19cf66859b94dbd5e60a27a823a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0c0e0e486d3e53e69a0c55435b87788933b4728c92383838a4b875ed17d9772ee8817ac297979b94c7ff90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba02096ed724353b5b167c6a5687554d5ef821719afe9cef309be784f086df6ece3a0072bc95b5e6ac6f6d7addbbfb5e0b2a818cf3387468150527d4c8e060fb57fa6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2096ed724353b5b167c6a5687554d5ef821719afe9cef309be784f086df6ece3",
+                        "s" : "0x072bc95b5e6ac6f6d7addbbfb5e0b2a818cf3387468150527d4c8e060fb57fa6",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xad96dc2596c45ff756e0600c7146d70d42a7add9082f2ae39a9e2553861c1965",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g3v0.json
index 7a73a41bf..d8a6f3b3d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g3v0Filler.json",
+            "sourceHash" : "b9055adcbae8aa234089179ed372c80baa2fd99f45aa1403017a3d8946ee8b2b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0x14613937b6156558aa7d43b77158ea945a59d5c07701bc36ca84bf9a6a977514",
+                    "mixHash" : "0x35992ace67108d9dcb49f2ad3d89b12f0c721814ee1b562b8a2cc76b1cf35393",
+                    "nonce" : "0xc83e1c71db163ec7",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfa2099c1b3f40105b79a689a02c1d50988c71584f087b15608bcdf475546d565",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0fa2099c1b3f40105b79a689a02c1d50988c71584f087b15608bcdf475546d565a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a035992ace67108d9dcb49f2ad3d89b12f0c721814ee1b562b8a2cc76b1cf3539388c83e1c71db163ec7f90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba07fe8bb24a88d70f852db13b5ede7a849ea323bd41218454f7c9c4524203ffbb3a0091fa8177bede26f228c4e7b8679a680dae95e4dadb7812cc6b886978986ad84c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7fe8bb24a88d70f852db13b5ede7a849ea323bd41218454f7c9c4524203ffbb3",
+                        "s" : "0x091fa8177bede26f228c4e7b8679a680dae95e4dadb7812cc6b886978986ad84",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x14613937b6156558aa7d43b77158ea945a59d5c07701bc36ca84bf9a6a977514",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0.json
index 99844605d..37daa8419 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_3_09984_39936_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0Filler.json",
             "sourceHash" : "6c641c5282726fe46a2cd09a89f4d70171c70ed2fb25765ad4c169d854c51a6a"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe4b3",
-                    "hash" : "0xd2e555a8ae9daf3c371a9ca41bc3ceb15e244cccbbc2d910aedd2dc8bdb7ea42",
-                    "mixHash" : "0x0a91b7cc1cb0134b3071533c52944b19e9e0e834b9173972c7499f653a3d2934",
-                    "nonce" : "0x73b1c4565c1b90b2",
+                    "hash" : "0x53ae75a511f330fae84363c6987bf6b2e557d7f4693703890e9f20769e6bf64b",
+                    "mixHash" : "0xa9df91d34397c2e319e6e7d10fc239c46a05837f6e0b507b4d234344d03ce97e",
+                    "nonce" : "0x69c197976d554a87",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xd83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0d83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a00a91b7cc1cb0134b3071533c52944b19e9e0e834b9173972c7499f653a3d29348873b1c4565c1b90b2f90169f9016601018302b69094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca084c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28a045ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389c0",
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0d83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0a9df91d34397c2e319e6e7d10fc239c46a05837f6e0b507b4d234344d03ce97e8869c197976d554a87f90169f9016601018302b69094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca084c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28a045ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2e555a8ae9daf3c371a9ca41bc3ceb15e244cccbbc2d910aedd2dc8bdb7ea42",
+        "lastblockhash" : "0x53ae75a511f330fae84363c6987bf6b2e557d7f4693703890e9f20769e6bf64b",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g1v0.json
index 7a73a41bf..8d7b89aa7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g1v0Filler.json",
+            "sourceHash" : "1eb01dd583635b4a6de9bb1056c43438ba8e91e85ee91fb953304018327c88f4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0x3cd61fe1a8b30671f5df8754fea1c44d4effb9ceec52bc2b134dc9595501e4e1",
+                    "mixHash" : "0x280429229450418e98356db6f93eaa50c45e6e2400a07344dc6c713d85e10696",
+                    "nonce" : "0x6f1f67430e98f177",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5493af43864cf61f3bd5843aec7adc1466be63e2aa57c7b6616bdfecbd21e0d3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca05493af43864cf61f3bd5843aec7adc1466be63e2aa57c7b6616bdfecbd21e0d3a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0280429229450418e98356db6f93eaa50c45e6e2400a07344dc6c713d85e10696886f1f67430e98f177f90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bc40b0f2538b760c5900aae073cac0b78204089c8a2167ee8a6583f2f1e8baeca02581e0b84c16c094b63838cf5c5978bd2c4adc281b086b01ca7a4a11c2c509bbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbc40b0f2538b760c5900aae073cac0b78204089c8a2167ee8a6583f2f1e8baec",
+                        "s" : "0x2581e0b84c16c094b63838cf5c5978bd2c4adc281b086b01ca7a4a11c2c509bb",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3cd61fe1a8b30671f5df8754fea1c44d4effb9ceec52bc2b134dc9595501e4e1",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g2v0.json
index 7a73a41bf..23f985ef8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g2v0Filler.json",
+            "sourceHash" : "83ec9e0ce6921581425366e3cc3bfef7369e5bded1ea7e4d079824f059183f9e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0xfba291bbe9cb053a138d4c166d308f2f7fcf60f1ded6670848b9038a1c6e59bb",
+                    "mixHash" : "0x17f5b6229cd809a641fc2710314d2ac4fa6be25e991805d7164f968ddda41857",
+                    "nonce" : "0x318c5e75fc10803c",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea62114d7d0bd7f5dc2d07b64996f26db0048b19cf66859b94dbd5e60a27a823",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0ea62114d7d0bd7f5dc2d07b64996f26db0048b19cf66859b94dbd5e60a27a823a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a017f5b6229cd809a641fc2710314d2ac4fa6be25e991805d7164f968ddda4185788318c5e75fc10803cf90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba02096ed724353b5b167c6a5687554d5ef821719afe9cef309be784f086df6ece3a0072bc95b5e6ac6f6d7addbbfb5e0b2a818cf3387468150527d4c8e060fb57fa6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2096ed724353b5b167c6a5687554d5ef821719afe9cef309be784f086df6ece3",
+                        "s" : "0x072bc95b5e6ac6f6d7addbbfb5e0b2a818cf3387468150527d4c8e060fb57fa6",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfba291bbe9cb053a138d4c166d308f2f7fcf60f1ded6670848b9038a1c6e59bb",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g3v0.json
index 7a73a41bf..b92eb7ded 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g3v0Filler.json",
+            "sourceHash" : "8714d352883236522db77f864b8e155b5b50e63eaa97631a9a6aef05da0e0a84"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0x1be77212d378eb31508fce5573256541049d60179e040f339492852dca78e674",
+                    "mixHash" : "0x820403f031cc05e76eda346a9dbb532007b70fd078b5d0aa0fd498d3ace7e730",
+                    "nonce" : "0xee1d5b612e527f94",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfa2099c1b3f40105b79a689a02c1d50988c71584f087b15608bcdf475546d565",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0fa2099c1b3f40105b79a689a02c1d50988c71584f087b15608bcdf475546d565a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0820403f031cc05e76eda346a9dbb532007b70fd078b5d0aa0fd498d3ace7e73088ee1d5b612e527f94f90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba07fe8bb24a88d70f852db13b5ede7a849ea323bd41218454f7c9c4524203ffbb3a0091fa8177bede26f228c4e7b8679a680dae95e4dadb7812cc6b886978986ad84c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7fe8bb24a88d70f852db13b5ede7a849ea323bd41218454f7c9c4524203ffbb3",
+                        "s" : "0x091fa8177bede26f228c4e7b8679a680dae95e4dadb7812cc6b886978986ad84",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1be77212d378eb31508fce5573256541049d60179e040f339492852dca78e674",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0.json
index 97d6cdce0..256abbf36 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_3_09984_39936_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0Filler.json",
             "sourceHash" : "0b0a86ea0e6db85681096a2af17b7d84f566997d526a3881106c354645569198"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xaf08",
-                    "hash" : "0x115f8c5b03f2f83cb6c99d4be7310256328b53c108facc76ff31dac53a6a86bb",
-                    "mixHash" : "0xbbe6ebf0a1e626cadaec2bd3a4bfc100849ed32124e718162e0ad877eee00165",
-                    "nonce" : "0x81c5c8e3d7d56f82",
+                    "hash" : "0x227f8ea0f459f4aba083450ab2a0f68acee0218ed350a052861209752e1b3cb5",
+                    "mixHash" : "0xee1e6912df85993a8aa62d8879c39e554fa3b10981aeb470e739f7c93a289351",
+                    "nonce" : "0x82a5ca5cb297cd87",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0x0ae518abb0092c57b64d3d2b49880f6fd813e538e5497064f5f0a67ef84bf712",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x7b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f8f22967e6adb680fbeb6ac1f45e2e3be98771207a2e3df6cff35d8e7cc53667a07b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215a00ae518abb0092c57b64d3d2b49880f6fd813e538e5497064f5f0a67ef84bf712b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082af088203e880a0bbe6ebf0a1e626cadaec2bd3a4bfc100849ed32124e718162e0ad877eee001658881c5c8e3d7d56f82f90168f90165010182af0894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0c07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9a077e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfec0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f8f22967e6adb680fbeb6ac1f45e2e3be98771207a2e3df6cff35d8e7cc53667a07b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215a00ae518abb0092c57b64d3d2b49880f6fd813e538e5497064f5f0a67ef84bf712b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082af088203e880a0ee1e6912df85993a8aa62d8879c39e554fa3b10981aeb470e739f7c93a2893518882a5ca5cb297cd87f90168f90165010182af0894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0c07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9a077e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x115f8c5b03f2f83cb6c99d4be7310256328b53c108facc76ff31dac53a6a86bb",
+        "lastblockhash" : "0x227f8ea0f459f4aba083450ab2a0f68acee0218ed350a052861209752e1b3cb5",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g1v0.json
index 7a73a41bf..2779efb68 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g1v0Filler.json",
+            "sourceHash" : "824fb3d7b8bf785b90232b5d348322b6aa6798ca3c9dea6fec656f01462f0051"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0xf3c3a32a567f08f4a8ac68f510bfcf339e5b9980dc690243e56f885eb3c24191",
+                    "mixHash" : "0x43689df5908cc7746a6d8481919222b4956ac7c10e83f5efa9193394abeb7afb",
+                    "nonce" : "0x9dd14f5be1c78038",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5493af43864cf61f3bd5843aec7adc1466be63e2aa57c7b6616bdfecbd21e0d3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca05493af43864cf61f3bd5843aec7adc1466be63e2aa57c7b6616bdfecbd21e0d3a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a043689df5908cc7746a6d8481919222b4956ac7c10e83f5efa9193394abeb7afb889dd14f5be1c78038f90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bc40b0f2538b760c5900aae073cac0b78204089c8a2167ee8a6583f2f1e8baeca02581e0b84c16c094b63838cf5c5978bd2c4adc281b086b01ca7a4a11c2c509bbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbc40b0f2538b760c5900aae073cac0b78204089c8a2167ee8a6583f2f1e8baec",
+                        "s" : "0x2581e0b84c16c094b63838cf5c5978bd2c4adc281b086b01ca7a4a11c2c509bb",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf3c3a32a567f08f4a8ac68f510bfcf339e5b9980dc690243e56f885eb3c24191",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g2v0.json
index 7a73a41bf..ef9a5789e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g2v0Filler.json",
+            "sourceHash" : "29caf80c524707ab8c9ea9e59018230aa946c37aae09c9f21e805f472d772e07"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0xa3670f2d062af1f756951185fd339d6799b613413c582fce41882c716b57feeb",
+                    "mixHash" : "0xbf0a74b5b46ec73fb7935394662179e04b2c156fc2f945ec36075d0d6941667b",
+                    "nonce" : "0x9bf47ec083b15f58",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea62114d7d0bd7f5dc2d07b64996f26db0048b19cf66859b94dbd5e60a27a823",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0ea62114d7d0bd7f5dc2d07b64996f26db0048b19cf66859b94dbd5e60a27a823a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0bf0a74b5b46ec73fb7935394662179e04b2c156fc2f945ec36075d0d6941667b889bf47ec083b15f58f90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba02096ed724353b5b167c6a5687554d5ef821719afe9cef309be784f086df6ece3a0072bc95b5e6ac6f6d7addbbfb5e0b2a818cf3387468150527d4c8e060fb57fa6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2096ed724353b5b167c6a5687554d5ef821719afe9cef309be784f086df6ece3",
+                        "s" : "0x072bc95b5e6ac6f6d7addbbfb5e0b2a818cf3387468150527d4c8e060fb57fa6",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa3670f2d062af1f756951185fd339d6799b613413c582fce41882c716b57feeb",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g3v0.json
index 7a73a41bf..a98a0fe48 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g3v0Filler.json",
+            "sourceHash" : "df901a4cbf0bb914f58da0db8337fb89605c168ee4cf4b2480c6be19e551fc1c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0x009ab6101aa182d4df1a25932885253bf29e193ff80261fcecd97801c4be1690",
+                    "mixHash" : "0xcbf7da70948fa164d90f4cbd009b3b940f43c589c10831d390ab17c69e70f763",
+                    "nonce" : "0x364c6660b55840a7",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfa2099c1b3f40105b79a689a02c1d50988c71584f087b15608bcdf475546d565",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0fa2099c1b3f40105b79a689a02c1d50988c71584f087b15608bcdf475546d565a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0cbf7da70948fa164d90f4cbd009b3b940f43c589c10831d390ab17c69e70f76388364c6660b55840a7f90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba07fe8bb24a88d70f852db13b5ede7a849ea323bd41218454f7c9c4524203ffbb3a0091fa8177bede26f228c4e7b8679a680dae95e4dadb7812cc6b886978986ad84c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7fe8bb24a88d70f852db13b5ede7a849ea323bd41218454f7c9c4524203ffbb3",
+                        "s" : "0x091fa8177bede26f228c4e7b8679a680dae95e4dadb7812cc6b886978986ad84",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x009ab6101aa182d4df1a25932885253bf29e193ff80261fcecd97801c4be1690",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0.json
index 357223c8b..7cb259a25 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_3_09984_39936_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0Filler.json",
             "sourceHash" : "888694fd9744f1319187a7a643847b2f55b0698aec5a7b1af7298033deea03a8"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xbac0",
-                    "hash" : "0xb4d210052e71728153a8cfb52ec71617fb78ae48b046aec2bf9f981e9e3f65d3",
-                    "mixHash" : "0xe7ba08cbafb72791d5ffd2ccb62e563e4142bc3e5cbfed2d3511fc855d1a6665",
-                    "nonce" : "0x30e53f6f7d704fc8",
+                    "hash" : "0x105325ec955b7e123089634de3af80dcb5bf1c7d70bf35251407476ca8d6b7f0",
+                    "mixHash" : "0x7484b0b37e509b5ad2298cbda17365fec2b6d15e04bc788053780f901500807e",
+                    "nonce" : "0x5a4742edf5743164",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0xfeb972b2fbf92075fa5edf3ec081ff58d8d56028fccd41b4ae56f33a6afc2326",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x10366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01b7d4bda43c8517ec811ef18312b047c90f612e685928f55e05416688563da0ca010366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771ea0feb972b2fbf92075fa5edf3ec081ff58d8d56028fccd41b4ae56f33a6afc2326b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bac08203e880a0e7ba08cbafb72791d5ffd2ccb62e563e4142bc3e5cbfed2d3511fc855d1a66658830e53f6f7d704fc8f90168f90165010182bac094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0ad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862ea0421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01b7d4bda43c8517ec811ef18312b047c90f612e685928f55e05416688563da0ca010366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771ea0feb972b2fbf92075fa5edf3ec081ff58d8d56028fccd41b4ae56f33a6afc2326b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bac08203e880a07484b0b37e509b5ad2298cbda17365fec2b6d15e04bc788053780f901500807e885a4742edf5743164f90168f90165010182bac094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0ad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862ea0421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4d210052e71728153a8cfb52ec71617fb78ae48b046aec2bf9f981e9e3f65d3",
+        "lastblockhash" : "0x105325ec955b7e123089634de3af80dcb5bf1c7d70bf35251407476ca8d6b7f0",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g1v0.json
index 7a73a41bf..3464907e2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g1v0Filler.json",
+            "sourceHash" : "5de26c075134e6d27b2eb56e7c31a33de7b957d1dd71299adaa7e09dccb5a3b5"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0x9315d83648cd5d230d6872253d4b2b8e2c7d56f0c6dec7b715c32c749191ada2",
+                    "mixHash" : "0x90a29d513b24544695e4f94300363886d8afa568f7a58e31379331a8d60fd0c9",
+                    "nonce" : "0x76ba5c63848ec3cf",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5493af43864cf61f3bd5843aec7adc1466be63e2aa57c7b6616bdfecbd21e0d3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca05493af43864cf61f3bd5843aec7adc1466be63e2aa57c7b6616bdfecbd21e0d3a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a090a29d513b24544695e4f94300363886d8afa568f7a58e31379331a8d60fd0c98876ba5c63848ec3cff90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bc40b0f2538b760c5900aae073cac0b78204089c8a2167ee8a6583f2f1e8baeca02581e0b84c16c094b63838cf5c5978bd2c4adc281b086b01ca7a4a11c2c509bbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbc40b0f2538b760c5900aae073cac0b78204089c8a2167ee8a6583f2f1e8baec",
+                        "s" : "0x2581e0b84c16c094b63838cf5c5978bd2c4adc281b086b01ca7a4a11c2c509bb",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9315d83648cd5d230d6872253d4b2b8e2c7d56f0c6dec7b715c32c749191ada2",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g2v0.json
index 7a73a41bf..023e316a0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g2v0Filler.json",
+            "sourceHash" : "cb139b8788c14b1fa19b9d7275fc67ab5e26df5cfc3821c8eabc58b6372e26a7"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0x452efdfa913e6acd30d6c319f597bb527d34eb996558b317c2bc7e9c0452679e",
+                    "mixHash" : "0x515c9eb14ad2efde8d4ca86b1a899af669541923547ac2b6a1f0d22def3f0ec2",
+                    "nonce" : "0xa14fe30a09bf0af3",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea62114d7d0bd7f5dc2d07b64996f26db0048b19cf66859b94dbd5e60a27a823",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0ea62114d7d0bd7f5dc2d07b64996f26db0048b19cf66859b94dbd5e60a27a823a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0515c9eb14ad2efde8d4ca86b1a899af669541923547ac2b6a1f0d22def3f0ec288a14fe30a09bf0af3f90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba02096ed724353b5b167c6a5687554d5ef821719afe9cef309be784f086df6ece3a0072bc95b5e6ac6f6d7addbbfb5e0b2a818cf3387468150527d4c8e060fb57fa6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2096ed724353b5b167c6a5687554d5ef821719afe9cef309be784f086df6ece3",
+                        "s" : "0x072bc95b5e6ac6f6d7addbbfb5e0b2a818cf3387468150527d4c8e060fb57fa6",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x452efdfa913e6acd30d6c319f597bb527d34eb996558b317c2bc7e9c0452679e",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g3v0.json
index 7a73a41bf..bea81f885 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g3v0Filler.json",
+            "sourceHash" : "9bc618c29fb7dd8702e33da50e748982acab0b4db1f95c17a401976ff95628c6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0x111236e8a836b9ba404f8908adbe4ed2b481f4d2cda0bcdaaa982ad9a45a597a",
+                    "mixHash" : "0xd54c20ae6e78a31c2db7939c77a77a05925af25b98b6f0a8bef291c7abd36bf4",
+                    "nonce" : "0xc93b6453a80ce401",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfa2099c1b3f40105b79a689a02c1d50988c71584f087b15608bcdf475546d565",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0fa2099c1b3f40105b79a689a02c1d50988c71584f087b15608bcdf475546d565a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0d54c20ae6e78a31c2db7939c77a77a05925af25b98b6f0a8bef291c7abd36bf488c93b6453a80ce401f90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba07fe8bb24a88d70f852db13b5ede7a849ea323bd41218454f7c9c4524203ffbb3a0091fa8177bede26f228c4e7b8679a680dae95e4dadb7812cc6b886978986ad84c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7fe8bb24a88d70f852db13b5ede7a849ea323bd41218454f7c9c4524203ffbb3",
+                        "s" : "0x091fa8177bede26f228c4e7b8679a680dae95e4dadb7812cc6b886978986ad84",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x111236e8a836b9ba404f8908adbe4ed2b481f4d2cda0bcdaaa982ad9a45a597a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0.json
index d7d9749c9..bd2aec8e5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_3_09984_39936_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0Filler.json",
             "sourceHash" : "961c732b047a1e7d3026afbcd7bbef02cc504837663969ad195338b52205bd9a"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe1d0",
-                    "hash" : "0x0e3634ac8230d1d0995777ec893b9f166f81cac8e4e51c799ea334cb4b695574",
-                    "mixHash" : "0x22d354985b6d6930cf3b6e38f2b059380ecaf0597bef7426ddb010008907e5d3",
-                    "nonce" : "0x7a9f1558535f2a86",
+                    "hash" : "0xca9b9f434d7148a85f450ced6d5ddfbeac8f106e5383f8c35a4c3b283c41d3ff",
+                    "mixHash" : "0xfaa538d10fa19a523c8acf3f1f0e02a7d53e99a23aacf3d8ffc70e0113f44e61",
+                    "nonce" : "0x6e38865ab77f89b3",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0x724d6c305620940ab3f8b8f059af464d41353a1d6b2a474baf34ff18fbf4bddb",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x3aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a7bf57c850285526e8c404a78b2814336bdcf057f0c41626a4fe64106d9c659ba03aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331a0724d6c305620940ab3f8b8f059af464d41353a1d6b2a474baf34ff18fbf4bddbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e1d08203e880a022d354985b6d6930cf3b6e38f2b059380ecaf0597bef7426ddb010008907e5d3887a9f1558535f2a86f90168f90165010182e1d094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba090aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756a025420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a7bf57c850285526e8c404a78b2814336bdcf057f0c41626a4fe64106d9c659ba03aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331a0724d6c305620940ab3f8b8f059af464d41353a1d6b2a474baf34ff18fbf4bddbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e1d08203e880a0faa538d10fa19a523c8acf3f1f0e02a7d53e99a23aacf3d8ffc70e0113f44e61886e38865ab77f89b3f90168f90165010182e1d094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba090aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756a025420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e3634ac8230d1d0995777ec893b9f166f81cac8e4e51c799ea334cb4b695574",
+        "lastblockhash" : "0xca9b9f434d7148a85f450ced6d5ddfbeac8f106e5383f8c35a4c3b283c41d3ff",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g1v0.json
index 7a73a41bf..432faea7d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g1v0Filler.json",
+            "sourceHash" : "6b0b6e21af42e0c82f6ab5d08c730e09e1a782c1b581bede794f152d7758c192"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0x9a63cf6bb9b1e716f638dd59e52cab7e23bb56170eb8e6b8265a60de2b519bef",
+                    "mixHash" : "0xaf2b791b7f78e4a1a4c6574be22144313b8cb13431d8b9219da0859079b4d347",
+                    "nonce" : "0xda3d78bb57a8140e",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5493af43864cf61f3bd5843aec7adc1466be63e2aa57c7b6616bdfecbd21e0d3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca05493af43864cf61f3bd5843aec7adc1466be63e2aa57c7b6616bdfecbd21e0d3a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0af2b791b7f78e4a1a4c6574be22144313b8cb13431d8b9219da0859079b4d34788da3d78bb57a8140ef90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bc40b0f2538b760c5900aae073cac0b78204089c8a2167ee8a6583f2f1e8baeca02581e0b84c16c094b63838cf5c5978bd2c4adc281b086b01ca7a4a11c2c509bbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbc40b0f2538b760c5900aae073cac0b78204089c8a2167ee8a6583f2f1e8baec",
+                        "s" : "0x2581e0b84c16c094b63838cf5c5978bd2c4adc281b086b01ca7a4a11c2c509bb",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9a63cf6bb9b1e716f638dd59e52cab7e23bb56170eb8e6b8265a60de2b519bef",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g2v0.json
index 7a73a41bf..516ec8563 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g2v0Filler.json",
+            "sourceHash" : "ea670df35392381bb19bd2a6a9503082ba58148cf27cabcfc1a5ae190b6b4530"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0x605233eca95c63216273689794de661e73f23096e4963396bd3bedbc0c1ce921",
+                    "mixHash" : "0xd06976d1dcff0ac1b5a4e10edf8de2844a880e40e66a84d3873fcfcf85bbca42",
+                    "nonce" : "0x0ca1ad72ebd3229f",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea62114d7d0bd7f5dc2d07b64996f26db0048b19cf66859b94dbd5e60a27a823",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0ea62114d7d0bd7f5dc2d07b64996f26db0048b19cf66859b94dbd5e60a27a823a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0d06976d1dcff0ac1b5a4e10edf8de2844a880e40e66a84d3873fcfcf85bbca42880ca1ad72ebd3229ff90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba02096ed724353b5b167c6a5687554d5ef821719afe9cef309be784f086df6ece3a0072bc95b5e6ac6f6d7addbbfb5e0b2a818cf3387468150527d4c8e060fb57fa6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2096ed724353b5b167c6a5687554d5ef821719afe9cef309be784f086df6ece3",
+                        "s" : "0x072bc95b5e6ac6f6d7addbbfb5e0b2a818cf3387468150527d4c8e060fb57fa6",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x605233eca95c63216273689794de661e73f23096e4963396bd3bedbc0c1ce921",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g3v0.json
index 7a73a41bf..ea7d32507 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_09984_39936_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g3v0Filler.json",
+            "sourceHash" : "99d5a3892266b1ca9ce9051d3e96d90fba6353fcd04a002b5dcc7dd74b84681e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0x124faa1153c764b0bbae584bc70b4bf2ed0f44ef838ff3ccf74a80ce89643b3c",
+                    "mixHash" : "0x669226b9e70f90d4a8df2cea77ca0092bc6895650a83cd9f9798c8bb1662a35f",
+                    "nonce" : "0x7a7f11073cd8d73c",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfa2099c1b3f40105b79a689a02c1d50988c71584f087b15608bcdf475546d565",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0fa2099c1b3f40105b79a689a02c1d50988c71584f087b15608bcdf475546d565a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0669226b9e70f90d4a8df2cea77ca0092bc6895650a83cd9f9798c8bb1662a35f887a7f11073cd8d73cf90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba07fe8bb24a88d70f852db13b5ede7a849ea323bd41218454f7c9c4524203ffbb3a0091fa8177bede26f228c4e7b8679a680dae95e4dadb7812cc6b886978986ad84c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7fe8bb24a88d70f852db13b5ede7a849ea323bd41218454f7c9c4524203ffbb3",
+                        "s" : "0x091fa8177bede26f228c4e7b8679a680dae95e4dadb7812cc6b886978986ad84",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x124faa1153c764b0bbae584bc70b4bf2ed0f44ef838ff3ccf74a80ce89643b3c",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0.json
index 3c6faf886..6ae79c93f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_3_28948_11579_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0Filler.json",
             "sourceHash" : "ba1934d3c13dee2116e4f8525c9b7ecd373c8579a3c0878a0394771c1e058236"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa92c",
-                    "hash" : "0x3d3085e767ff7f77d3ec1ae8671f8bfd6219c852cae419c4c1b3310453a0d5c6",
-                    "mixHash" : "0xdabeb3c5856ce1b67d2dcdff1fc86a8d11e26a3cd37e2c923b2cddb877df03ed",
-                    "nonce" : "0xfc82479245a23917",
+                    "hash" : "0x125b54e166035620b1452d2232c774d07a513eb18980fcb5bd2564bd374ff605",
+                    "mixHash" : "0xe052d73162193a60d42f4eef430b803d8fd01e894b69bf1b3b654d5300517cf8",
+                    "nonce" : "0xc2473b4a91a7a0d3",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0x1c42eab3e247d43b949e5d1a82eafecf93190006f56007b8969bbf18413d3167",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xfdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02239721f36bed39eb21c3352dcfaae9190ea326431c91e9b52e4eb7cd623ecc5a0fdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4a01c42eab3e247d43b949e5d1a82eafecf93190006f56007b8969bbf18413d3167b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a92c8203e880a0dabeb3c5856ce1b67d2dcdff1fc86a8d11e26a3cd37e2c923b2cddb877df03ed88fc82479245a23917f90168f90165010182a92c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0d7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003a02ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02239721f36bed39eb21c3352dcfaae9190ea326431c91e9b52e4eb7cd623ecc5a0fdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4a01c42eab3e247d43b949e5d1a82eafecf93190006f56007b8969bbf18413d3167b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a92c8203e880a0e052d73162193a60d42f4eef430b803d8fd01e894b69bf1b3b654d5300517cf888c2473b4a91a7a0d3f90168f90165010182a92c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0d7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003a02ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d3085e767ff7f77d3ec1ae8671f8bfd6219c852cae419c4c1b3310453a0d5c6",
+        "lastblockhash" : "0x125b54e166035620b1452d2232c774d07a513eb18980fcb5bd2564bd374ff605",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g1v0.json
index 7a73a41bf..8a73a5e63 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_28948_11579_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g1v0Filler.json",
+            "sourceHash" : "798e19700aa32dd39f38b81eefa00d110eaf3d2b9ac9ceb9f328c1ae253f51a0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0x7138b53069ad98df9e1d491fd93d58cbc3dfa9a7452ab36f8fa1c59266743a03",
+                    "mixHash" : "0x3db9ba441d5036974af086a58a75e6b1a8e36d15ac5cc4e0104d88ef7adec021",
+                    "nonce" : "0xc7b7b38f84fe54c6",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5493af43864cf61f3bd5843aec7adc1466be63e2aa57c7b6616bdfecbd21e0d3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca05493af43864cf61f3bd5843aec7adc1466be63e2aa57c7b6616bdfecbd21e0d3a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a03db9ba441d5036974af086a58a75e6b1a8e36d15ac5cc4e0104d88ef7adec02188c7b7b38f84fe54c6f90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bc40b0f2538b760c5900aae073cac0b78204089c8a2167ee8a6583f2f1e8baeca02581e0b84c16c094b63838cf5c5978bd2c4adc281b086b01ca7a4a11c2c509bbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbc40b0f2538b760c5900aae073cac0b78204089c8a2167ee8a6583f2f1e8baec",
+                        "s" : "0x2581e0b84c16c094b63838cf5c5978bd2c4adc281b086b01ca7a4a11c2c509bb",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7138b53069ad98df9e1d491fd93d58cbc3dfa9a7452ab36f8fa1c59266743a03",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g2v0.json
index 7a73a41bf..737ef3533 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_28948_11579_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g2v0Filler.json",
+            "sourceHash" : "2033412ff1770e2c4957621d3b1699ceddc2422f1693f495d848f004b4971cf9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0x3a2b5d668060d0811d25728095e28242db3020bdbff5625a9c0040eb1fc60dad",
+                    "mixHash" : "0xd3aea319ac4fe5064e9ced6e95c37def337a97f4628e12bc54ed32790f4a6403",
+                    "nonce" : "0xe4326544d12055d4",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea62114d7d0bd7f5dc2d07b64996f26db0048b19cf66859b94dbd5e60a27a823",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0ea62114d7d0bd7f5dc2d07b64996f26db0048b19cf66859b94dbd5e60a27a823a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0d3aea319ac4fe5064e9ced6e95c37def337a97f4628e12bc54ed32790f4a640388e4326544d12055d4f90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba02096ed724353b5b167c6a5687554d5ef821719afe9cef309be784f086df6ece3a0072bc95b5e6ac6f6d7addbbfb5e0b2a818cf3387468150527d4c8e060fb57fa6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2096ed724353b5b167c6a5687554d5ef821719afe9cef309be784f086df6ece3",
+                        "s" : "0x072bc95b5e6ac6f6d7addbbfb5e0b2a818cf3387468150527d4c8e060fb57fa6",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3a2b5d668060d0811d25728095e28242db3020bdbff5625a9c0040eb1fc60dad",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g3v0.json
index 7a73a41bf..457d442b0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_28948_11579_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g3v0Filler.json",
+            "sourceHash" : "83f54855e2060349c11cbf8582bc62f9e3d7c094874c7fcf40b82b7b0aa50b9e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe4b3",
+                    "hash" : "0xd1208afca86e94a59ca57bebb60289588f94d4e4722c16c5e1fff27c437bf754",
+                    "mixHash" : "0xa1049394d66cb55344314704a17e5553c1e033d1239f985fcd25e4ecae5986c2",
+                    "nonce" : "0x676beb2396a0dbbf",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0xbc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066",
+                    "stateRoot" : "0x25261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfa2099c1b3f40105b79a689a02c1d50988c71584f087b15608bcdf475546d565",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025261c5eab9cbf70e6ccc139ac53a908db4f7c161b628026cdba2069f55fd3aca0fa2099c1b3f40105b79a689a02c1d50988c71584f087b15608bcdf475546d565a0bc2b31472aaaa6ab1461c168c4873938a56d04a158e3e69e185db1899c25d066b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e4b38203e880a0a1049394d66cb55344314704a17e5553c1e033d1239f985fcd25e4ecae5986c288676beb2396a0dbbff90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba07fe8bb24a88d70f852db13b5ede7a849ea323bd41218454f7c9c4524203ffbb3a0091fa8177bede26f228c4e7b8679a680dae95e4dadb7812cc6b886978986ad84c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7fe8bb24a88d70f852db13b5ede7a849ea323bd41218454f7c9c4524203ffbb3",
+                        "s" : "0x091fa8177bede26f228c4e7b8679a680dae95e4dadb7812cc6b886978986ad84",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd1208afca86e94a59ca57bebb60289588f94d4e4722c16c5e1fff27c437bf754",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761195f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0.json
index 27b95bbee..302869375 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_3_5_100_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0Filler.json",
             "sourceHash" : "82210c0c82c88693bcc7a5a6bd6662f4368b5d14eeb3fc0e753f24cd58ba6563"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x24e7b5005e78e16835ed6dc644bdee7c018968a432f738632452052823ad8544",
-                    "mixHash" : "0x37034ef20c6fad5bf6968ed1aeea57fae705b193f66f6f64861017904e8dba8c",
-                    "nonce" : "0x66417f0c48824f15",
+                    "hash" : "0xb71885801e41079fb41599b90aee9ffd7c643f1bf23d74087f7b19cba7033964",
+                    "mixHash" : "0xbf116964c75ec5ff9ccf975a08dbdd0214989f76501454332d70cc212fee6299",
+                    "nonce" : "0xe5bda2426c847caf",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xf64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0f64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a037034ef20c6fad5bf6968ed1aeea57fae705b193f66f6f64861017904e8dba8c8866417f0c48824f15f90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca044f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593a040d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0f64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0bf116964c75ec5ff9ccf975a08dbdd0214989f76501454332d70cc212fee629988e5bda2426c847caff90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca044f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593a040d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24e7b5005e78e16835ed6dc644bdee7c018968a432f738632452052823ad8544",
+        "lastblockhash" : "0xb71885801e41079fb41599b90aee9ffd7c643f1bf23d74087f7b19cba7033964",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g1v0.json
index 7a73a41bf..fadfc48be 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g1v0Filler.json",
+            "sourceHash" : "6c933a9b97ab9831096421f1ceb39984be05106911f021f54640db0f2e4633a1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x44a06e6a72f3a1306f0eb2d68bcb17f0a6db3aa34d0394124375fe5c8f18b7da",
+                    "mixHash" : "0xffb9d4380a6040e55cfe680a888e6e47ea8c9dce85bf4fd0d836efdae63a569f",
+                    "nonce" : "0xf5fe1f0dd717abca",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf8a95933bfcf2c1548fbb719e71489834c7fc075918807fa2ef7d064f31b4468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0f8a95933bfcf2c1548fbb719e71489834c7fc075918807fa2ef7d064f31b4468a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0ffb9d4380a6040e55cfe680a888e6e47ea8c9dce85bf4fd0d836efdae63a569f88f5fe1f0dd717abcaf90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca062ab6b0f8b2e80a49163c77b074b77c863261268b3cadd851cd172b491638259a02b5f110ddf647ab9ecafc1a2233424a0666e25d8738716f75fae1fe1c70d31e5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x62ab6b0f8b2e80a49163c77b074b77c863261268b3cadd851cd172b491638259",
+                        "s" : "0x2b5f110ddf647ab9ecafc1a2233424a0666e25d8738716f75fae1fe1c70d31e5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x44a06e6a72f3a1306f0eb2d68bcb17f0a6db3aa34d0394124375fe5c8f18b7da",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g2v0.json
index 7a73a41bf..cefd92b29 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g2v0Filler.json",
+            "sourceHash" : "bc5c5695d1e8c7411ce8f7c1e08456e606fd76ebe385e05dfeca1b22613ef6c4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xbbc1b4240b150ae33336ca26f291b86b4f0a9b8d189062a944b2ef4cdd120e72",
+                    "mixHash" : "0x24d8dc23ea2e18df9fa139702b68761cad1cf5e4085986449a5ac2c4b503fa77",
+                    "nonce" : "0x7e7d51da47ae7a2b",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbf97606e56b20491bfbf0c54cd8031ed0e4c9f17c924a9dfe9c54adef14fbf69",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0bf97606e56b20491bfbf0c54cd8031ed0e4c9f17c924a9dfe9c54adef14fbf69a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a024d8dc23ea2e18df9fa139702b68761cad1cf5e4085986449a5ac2c4b503fa77887e7d51da47ae7a2bf90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0588e608980b267da5171e3e8cc276a9685ce23ad5b3d12de672eae1e855b0045a07c1d03f332558c115c011112f56671417c8e7f8c6517ae0f7df90e5885674706c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x588e608980b267da5171e3e8cc276a9685ce23ad5b3d12de672eae1e855b0045",
+                        "s" : "0x7c1d03f332558c115c011112f56671417c8e7f8c6517ae0f7df90e5885674706",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbbc1b4240b150ae33336ca26f291b86b4f0a9b8d189062a944b2ef4cdd120e72",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g3v0.json
index 7a73a41bf..16c74e232 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g3v0Filler.json",
+            "sourceHash" : "4a47aee9c54b97b465c12265629ac6ceced409e3bd1dc623cc3ce1d776c3181a"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x38c81505b5741ead33af3de50e42962fce9ae62d830b2084a832e1c6b7fc505a",
+                    "mixHash" : "0x1e3bf9e11dcfe8ebdab5d07a8bc0256c19ed042060793bd4394593c3e25a8aa1",
+                    "nonce" : "0x00dd23aee62da873",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc396861cb69673079dd2fae3a8f87a57455a9563ed2153cdaed65a7aa816b050",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0c396861cb69673079dd2fae3a8f87a57455a9563ed2153cdaed65a7aa816b050a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a01e3bf9e11dcfe8ebdab5d07a8bc0256c19ed042060793bd4394593c3e25a8aa18800dd23aee62da873f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca088dd88811c90536a48cdf117eeb3e1e4649d4d4c7097a6d67c6b304b2794555ea0485053724e36c34440493cb0e95f26022429d300827b0140fd7e0c549f6c8476c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x88dd88811c90536a48cdf117eeb3e1e4649d4d4c7097a6d67c6b304b2794555e",
+                        "s" : "0x485053724e36c34440493cb0e95f26022429d300827b0140fd7e0c549f6c8476",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x38c81505b5741ead33af3de50e42962fce9ae62d830b2084a832e1c6b7fc505a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0.json
index 42e014fb4..875298b2e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_3_5_100_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0Filler.json",
             "sourceHash" : "fc63154d878d977c1987f1aa1d1d55070f9ea8aa6ebea88bd9bb6cee73671b6c"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x0d135d06ad9309b5c133fb978032132e73eb33eb9d6a63becc4b13aec51f28a1",
-                    "mixHash" : "0xd0f7167fb1426d89014801d3b89c1701d74f2eb86508579ea5959335b9975b36",
-                    "nonce" : "0x22aedb06188b8c6d",
+                    "hash" : "0x2ae19c57e621c35d73908238d5d4c1aa7e34b05b66cba15d803a940c8ff19d3b",
+                    "mixHash" : "0x2ac70fa4e07fba698b7ef75de458e000bd2d215b0999a3c22ff8d36a137d7201",
+                    "nonce" : "0xc66563b3b76e498d",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x4b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a04b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcda0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0d0f7167fb1426d89014801d3b89c1701d74f2eb86508579ea5959335b9975b368822aedb06188b8c6df90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0a97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddada0755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a04b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcda0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a02ac70fa4e07fba698b7ef75de458e000bd2d215b0999a3c22ff8d36a137d720188c66563b3b76e498df90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0a97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddada0755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d135d06ad9309b5c133fb978032132e73eb33eb9d6a63becc4b13aec51f28a1",
+        "lastblockhash" : "0x2ae19c57e621c35d73908238d5d4c1aa7e34b05b66cba15d803a940c8ff19d3b",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g1v0.json
index 7a73a41bf..8680e4f67 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g1v0Filler.json",
+            "sourceHash" : "42b10b4c0a83373edeeb754141c80254bb1b386119b89028a834f4a39449de42"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x42bc3f6ce3d20ca3a7de1bdc1ecc17f74aee7eab91ac983eb2e415def012f075",
+                    "mixHash" : "0x2b7a3c7cd0b5786d53daee59fffbaa7285cf14eee30d75c96d52bb8397539733",
+                    "nonce" : "0x79000f7c0789d57f",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf8a95933bfcf2c1548fbb719e71489834c7fc075918807fa2ef7d064f31b4468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0f8a95933bfcf2c1548fbb719e71489834c7fc075918807fa2ef7d064f31b4468a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a02b7a3c7cd0b5786d53daee59fffbaa7285cf14eee30d75c96d52bb83975397338879000f7c0789d57ff90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca062ab6b0f8b2e80a49163c77b074b77c863261268b3cadd851cd172b491638259a02b5f110ddf647ab9ecafc1a2233424a0666e25d8738716f75fae1fe1c70d31e5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x62ab6b0f8b2e80a49163c77b074b77c863261268b3cadd851cd172b491638259",
+                        "s" : "0x2b5f110ddf647ab9ecafc1a2233424a0666e25d8738716f75fae1fe1c70d31e5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x42bc3f6ce3d20ca3a7de1bdc1ecc17f74aee7eab91ac983eb2e415def012f075",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g2v0.json
index 7a73a41bf..cdbed3e41 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g2v0Filler.json",
+            "sourceHash" : "29cce204a75676833efad7d00192d1a0e6454058592dd39e2b1ba5e8ccd553e9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x2cf4dcc75eab27c69b5a6f5f082f877b6346bb53a2d71a299b05aad69449fa46",
+                    "mixHash" : "0xc2774b9c68d2bae21f90fb360ff2435df3659a3d31c9fe7e2f18228c62eeb288",
+                    "nonce" : "0x32e4842843622a75",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbf97606e56b20491bfbf0c54cd8031ed0e4c9f17c924a9dfe9c54adef14fbf69",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0bf97606e56b20491bfbf0c54cd8031ed0e4c9f17c924a9dfe9c54adef14fbf69a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0c2774b9c68d2bae21f90fb360ff2435df3659a3d31c9fe7e2f18228c62eeb2888832e4842843622a75f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0588e608980b267da5171e3e8cc276a9685ce23ad5b3d12de672eae1e855b0045a07c1d03f332558c115c011112f56671417c8e7f8c6517ae0f7df90e5885674706c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x588e608980b267da5171e3e8cc276a9685ce23ad5b3d12de672eae1e855b0045",
+                        "s" : "0x7c1d03f332558c115c011112f56671417c8e7f8c6517ae0f7df90e5885674706",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2cf4dcc75eab27c69b5a6f5f082f877b6346bb53a2d71a299b05aad69449fa46",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g3v0.json
index 7a73a41bf..82f02a80d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g3v0Filler.json",
+            "sourceHash" : "d84851a6e498f0091c196acc4be4a9c3419f2a8cdd082e8fb428626c6f7b6c6f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x7ddcefe8bbe0073f3afd6d236f9aa7496f78781426e1e60cc6de5cba0d35dbda",
+                    "mixHash" : "0xc95c584f88b3cd4318fa97bfa9c8240fa43e171bcab630a00e17cd2a8f827718",
+                    "nonce" : "0x289c8b6d293c6578",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc396861cb69673079dd2fae3a8f87a57455a9563ed2153cdaed65a7aa816b050",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0c396861cb69673079dd2fae3a8f87a57455a9563ed2153cdaed65a7aa816b050a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0c95c584f88b3cd4318fa97bfa9c8240fa43e171bcab630a00e17cd2a8f82771888289c8b6d293c6578f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca088dd88811c90536a48cdf117eeb3e1e4649d4d4c7097a6d67c6b304b2794555ea0485053724e36c34440493cb0e95f26022429d300827b0140fd7e0c549f6c8476c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x88dd88811c90536a48cdf117eeb3e1e4649d4d4c7097a6d67c6b304b2794555e",
+                        "s" : "0x485053724e36c34440493cb0e95f26022429d300827b0140fd7e0c549f6c8476",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7ddcefe8bbe0073f3afd6d236f9aa7496f78781426e1e60cc6de5cba0d35dbda",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0.json
index 3f53edf3f..299f9e8da 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_3_5_100_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0Filler.json",
             "sourceHash" : "6cfb83896cbd7d44ca9e6e2f86b0809da82df88a8295726648bb5a34f4d57553"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa82c",
-                    "hash" : "0xf5aace1a9e2b38f0a2a8e7ad2ce7bc17c08e094cc46c9baa58e6090be59e4e10",
-                    "mixHash" : "0x810d831f0e0256c15748f11f64065b3db092562d7ec20968d4332bb6d197f8c1",
-                    "nonce" : "0xa6b8a93ef7add7df",
+                    "hash" : "0x4656280612deeedf84555f06407645fc4f8b96a156481bd71cc15f906e8860f5",
+                    "mixHash" : "0x94676350aa31e5484df2b0560943b9e0bdef9c1348951878730782e2d8b0864a",
+                    "nonce" : "0x00eb200df5c1d738",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x7917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097b",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xcdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90325f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09d98447bd1127cca70444b67ba28c0212418acd6a68598c0ab14fcc175629cb0a0cdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0ea07917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a0810d831f0e0256c15748f11f64065b3db092562d7ec20968d4332bb6d197f8c188a6b8a93ef7add7dff90126f90123010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca02bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c7009fc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76c0",
+                "rlp" : "0xf90325f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09d98447bd1127cca70444b67ba28c0212418acd6a68598c0ab14fcc175629cb0a0cdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0ea07917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a094676350aa31e5484df2b0560943b9e0bdef9c1348951878730782e2d8b0864a8800eb200df5c1d738f90126f90123010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca02bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c7009fc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf5aace1a9e2b38f0a2a8e7ad2ce7bc17c08e094cc46c9baa58e6090be59e4e10",
+        "lastblockhash" : "0x4656280612deeedf84555f06407645fc4f8b96a156481bd71cc15f906e8860f5",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g1v0.json
index 7a73a41bf..de8c8e33b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g1v0Filler.json",
+            "sourceHash" : "bbff0f93104d66e274efee60776e9e7ee96d6e7e5360ffa6eb74eb0935347cdc"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x3a39f5e5be2632be91bc70f17397106398e4981ce7cf2022f0e6c831d14f2845",
+                    "mixHash" : "0xb1ea079f90fd49fc975f6f632b517dde5040849caf7f4371c0d174b865247b7f",
+                    "nonce" : "0x5681fe72fb6b3d29",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf8a95933bfcf2c1548fbb719e71489834c7fc075918807fa2ef7d064f31b4468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0f8a95933bfcf2c1548fbb719e71489834c7fc075918807fa2ef7d064f31b4468a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0b1ea079f90fd49fc975f6f632b517dde5040849caf7f4371c0d174b865247b7f885681fe72fb6b3d29f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca062ab6b0f8b2e80a49163c77b074b77c863261268b3cadd851cd172b491638259a02b5f110ddf647ab9ecafc1a2233424a0666e25d8738716f75fae1fe1c70d31e5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x62ab6b0f8b2e80a49163c77b074b77c863261268b3cadd851cd172b491638259",
+                        "s" : "0x2b5f110ddf647ab9ecafc1a2233424a0666e25d8738716f75fae1fe1c70d31e5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3a39f5e5be2632be91bc70f17397106398e4981ce7cf2022f0e6c831d14f2845",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g2v0.json
index 7a73a41bf..50fb163fa 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g2v0Filler.json",
+            "sourceHash" : "2d273e9b6b33f8d5d0721b0a25ddf5ab4a196d528798fbc6295215d5cf3127bb"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x8fea322b8219013690391ae2e33eb5d3aa8d640848d892b08fc6f5740a08e56e",
+                    "mixHash" : "0xc4bf027b56c229f8cd3cc7aa5af99dcec1721e675cad60db713885abe772c969",
+                    "nonce" : "0x1f4da0a441bc428c",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbf97606e56b20491bfbf0c54cd8031ed0e4c9f17c924a9dfe9c54adef14fbf69",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0bf97606e56b20491bfbf0c54cd8031ed0e4c9f17c924a9dfe9c54adef14fbf69a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0c4bf027b56c229f8cd3cc7aa5af99dcec1721e675cad60db713885abe772c969881f4da0a441bc428cf90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0588e608980b267da5171e3e8cc276a9685ce23ad5b3d12de672eae1e855b0045a07c1d03f332558c115c011112f56671417c8e7f8c6517ae0f7df90e5885674706c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x588e608980b267da5171e3e8cc276a9685ce23ad5b3d12de672eae1e855b0045",
+                        "s" : "0x7c1d03f332558c115c011112f56671417c8e7f8c6517ae0f7df90e5885674706",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8fea322b8219013690391ae2e33eb5d3aa8d640848d892b08fc6f5740a08e56e",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g3v0.json
index 7a73a41bf..c97cbbee0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g3v0Filler.json",
+            "sourceHash" : "7a158e3d25bf0978478a0307ea1c53ba61887e598c1786ada0bbcc2912be2f22"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x4b9b45be434d712fd1996f7277ffef8f48e9e97c93f56fd391fd38eb946c0bd5",
+                    "mixHash" : "0xdbd6ab41cf4c125740e3c2b6a558ea887975134107d7b8a0b4b41064d74d33e5",
+                    "nonce" : "0x9cfe25e2e4acfd14",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc396861cb69673079dd2fae3a8f87a57455a9563ed2153cdaed65a7aa816b050",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0c396861cb69673079dd2fae3a8f87a57455a9563ed2153cdaed65a7aa816b050a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0dbd6ab41cf4c125740e3c2b6a558ea887975134107d7b8a0b4b41064d74d33e5889cfe25e2e4acfd14f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca088dd88811c90536a48cdf117eeb3e1e4649d4d4c7097a6d67c6b304b2794555ea0485053724e36c34440493cb0e95f26022429d300827b0140fd7e0c549f6c8476c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x88dd88811c90536a48cdf117eeb3e1e4649d4d4c7097a6d67c6b304b2794555e",
+                        "s" : "0x485053724e36c34440493cb0e95f26022429d300827b0140fd7e0c549f6c8476",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4b9b45be434d712fd1996f7277ffef8f48e9e97c93f56fd391fd38eb946c0bd5",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0.json
index 6f64c0fd8..8d0e68a2a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_3_5_100_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0Filler.json",
             "sourceHash" : "2e6097b7eb7edf4325bbceafc546a1c229f05f19e8703cb639c68e3c43336827"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x69984658421ac4df16147748b5890af1b643192742c8fb4b67bb00b74f184c75",
-                    "mixHash" : "0x9fdb1ae62973a3db60959136d56a5afe3acda9cc0b8830a2c70ed656e17f43f5",
-                    "nonce" : "0xdcebff927f60b77d",
+                    "hash" : "0x57fa987e7161424b804c3026afe17ab5c320a2f679f5771d5a7fb777ce66b2cd",
+                    "mixHash" : "0x14ceda9459a4a115a3cdb074db80a92cf01e3978b84a4448e384ce06d4d097b5",
+                    "nonce" : "0xde2ef04276a7825a",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x9d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a09d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a09fdb1ae62973a3db60959136d56a5afe3acda9cc0b8830a2c70ed656e17f43f588dcebff927f60b77df90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca03ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76ba05f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a09d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a014ceda9459a4a115a3cdb074db80a92cf01e3978b84a4448e384ce06d4d097b588de2ef04276a7825af90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca03ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76ba05f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x69984658421ac4df16147748b5890af1b643192742c8fb4b67bb00b74f184c75",
+        "lastblockhash" : "0x57fa987e7161424b804c3026afe17ab5c320a2f679f5771d5a7fb777ce66b2cd",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g1v0.json
index 7a73a41bf..7de41aab4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g1v0Filler.json",
+            "sourceHash" : "b1093c69714e620d232ee1c0c2c0d1e76c1349817f5cf033d9b43196d30f1aab"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x7856db9bdec413dcee7323ddaee56ea6365604f769296658929f0ec4ae1cb1a8",
+                    "mixHash" : "0xa764e02d9f0c417bbaa0a6e19f032ace4137c8ba5d048782b5c729a909be589d",
+                    "nonce" : "0x6e7afe0be434ae05",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf8a95933bfcf2c1548fbb719e71489834c7fc075918807fa2ef7d064f31b4468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0f8a95933bfcf2c1548fbb719e71489834c7fc075918807fa2ef7d064f31b4468a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0a764e02d9f0c417bbaa0a6e19f032ace4137c8ba5d048782b5c729a909be589d886e7afe0be434ae05f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca062ab6b0f8b2e80a49163c77b074b77c863261268b3cadd851cd172b491638259a02b5f110ddf647ab9ecafc1a2233424a0666e25d8738716f75fae1fe1c70d31e5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x62ab6b0f8b2e80a49163c77b074b77c863261268b3cadd851cd172b491638259",
+                        "s" : "0x2b5f110ddf647ab9ecafc1a2233424a0666e25d8738716f75fae1fe1c70d31e5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7856db9bdec413dcee7323ddaee56ea6365604f769296658929f0ec4ae1cb1a8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g2v0.json
index 7a73a41bf..f814db8df 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g2v0Filler.json",
+            "sourceHash" : "699c43c5053f3837ba2eb23e25380f436ebb30b8a6e220da973f3feb9494b9e5"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xe728305ebbcdcd2363a8e11d886b22b6451cc973f11fb0e0c38b9126e2740c95",
+                    "mixHash" : "0xdb6b4875dafc3dc22ab167e4f8e839e658210f48556abafdfe876089ee863f96",
+                    "nonce" : "0x54edf7d9a27e0d8a",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbf97606e56b20491bfbf0c54cd8031ed0e4c9f17c924a9dfe9c54adef14fbf69",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0bf97606e56b20491bfbf0c54cd8031ed0e4c9f17c924a9dfe9c54adef14fbf69a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0db6b4875dafc3dc22ab167e4f8e839e658210f48556abafdfe876089ee863f968854edf7d9a27e0d8af90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0588e608980b267da5171e3e8cc276a9685ce23ad5b3d12de672eae1e855b0045a07c1d03f332558c115c011112f56671417c8e7f8c6517ae0f7df90e5885674706c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x588e608980b267da5171e3e8cc276a9685ce23ad5b3d12de672eae1e855b0045",
+                        "s" : "0x7c1d03f332558c115c011112f56671417c8e7f8c6517ae0f7df90e5885674706",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe728305ebbcdcd2363a8e11d886b22b6451cc973f11fb0e0c38b9126e2740c95",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g3v0.json
index 7a73a41bf..c1735cb07 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g3v0Filler.json",
+            "sourceHash" : "62199175cf966f1ec726afc5dc1b66a21d5d8b7fd4cd436461c8eea781ff9f91"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x3a46f79be11007497df2e74b8ccaa4e13e21780e05397f919dd208434c96ad05",
+                    "mixHash" : "0xdeaeb310b85734b5fc062a16c1b805b45e5613fce47273c9aeefe2106f81a516",
+                    "nonce" : "0xe71089b1a0cc1d04",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc396861cb69673079dd2fae3a8f87a57455a9563ed2153cdaed65a7aa816b050",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0c396861cb69673079dd2fae3a8f87a57455a9563ed2153cdaed65a7aa816b050a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0deaeb310b85734b5fc062a16c1b805b45e5613fce47273c9aeefe2106f81a51688e71089b1a0cc1d04f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca088dd88811c90536a48cdf117eeb3e1e4649d4d4c7097a6d67c6b304b2794555ea0485053724e36c34440493cb0e95f26022429d300827b0140fd7e0c549f6c8476c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x88dd88811c90536a48cdf117eeb3e1e4649d4d4c7097a6d67c6b304b2794555e",
+                        "s" : "0x485053724e36c34440493cb0e95f26022429d300827b0140fd7e0c549f6c8476",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3a46f79be11007497df2e74b8ccaa4e13e21780e05397f919dd208434c96ad05",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0.json
index bca88cef7..794fdab06 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_3_5_100_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0Filler.json",
             "sourceHash" : "8664fd87e893797c6b1c7976cc14408e289b27fda6ba3c4758104a6a0b9e69d8"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0xeccd69e1adaaed47d5a99098296d44af33df460ce1d0ca8f20281578b76c829b",
-                    "mixHash" : "0xcf3c76fa089e2dafcd049671e2db79d6dbd395ce780a7b2f095af6b21bd2fbda",
-                    "nonce" : "0x6968ab71b1ebd5ad",
+                    "hash" : "0xdb18c21d020c2e1393f703ede612326ef48070823d4b1821cdd86fb42f1cafbd",
+                    "mixHash" : "0x22d23addbdff26867f73ad08987284a380ff53fb9dd9bede1585dc135b27a353",
+                    "nonce" : "0xb26369b13125854f",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x2906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a02906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0cf3c76fa089e2dafcd049671e2db79d6dbd395ce780a7b2f095af6b21bd2fbda886968ab71b1ebd5adf90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca0fd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5aa07d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a02906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a022d23addbdff26867f73ad08987284a380ff53fb9dd9bede1585dc135b27a35388b26369b13125854ff90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca0fd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5aa07d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeccd69e1adaaed47d5a99098296d44af33df460ce1d0ca8f20281578b76c829b",
+        "lastblockhash" : "0xdb18c21d020c2e1393f703ede612326ef48070823d4b1821cdd86fb42f1cafbd",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g1v0.json
index 7a73a41bf..ea0ae6b80 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g1v0Filler.json",
+            "sourceHash" : "5808f09a7869928814e7b145472ca34ef2aed4564d34d89bf0a08113854551a6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xcf34b6d3b62578c3bf3cd9be119752ee8c75a7be02508f97d98623f1633c3a8f",
+                    "mixHash" : "0x9daf91c99c8ec1b855130009b34ed05bbdbff26198b1f718e6b9203f6d4a3006",
+                    "nonce" : "0xb2a69fb10c713505",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf8a95933bfcf2c1548fbb719e71489834c7fc075918807fa2ef7d064f31b4468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0f8a95933bfcf2c1548fbb719e71489834c7fc075918807fa2ef7d064f31b4468a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a09daf91c99c8ec1b855130009b34ed05bbdbff26198b1f718e6b9203f6d4a300688b2a69fb10c713505f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca062ab6b0f8b2e80a49163c77b074b77c863261268b3cadd851cd172b491638259a02b5f110ddf647ab9ecafc1a2233424a0666e25d8738716f75fae1fe1c70d31e5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x62ab6b0f8b2e80a49163c77b074b77c863261268b3cadd851cd172b491638259",
+                        "s" : "0x2b5f110ddf647ab9ecafc1a2233424a0666e25d8738716f75fae1fe1c70d31e5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcf34b6d3b62578c3bf3cd9be119752ee8c75a7be02508f97d98623f1633c3a8f",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g2v0.json
index 7a73a41bf..353cc34f9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g2v0Filler.json",
+            "sourceHash" : "4781bf98d55ef2bd3b4ec4f9f081827acefd50428a20e9ec7e743a62f6af0af9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xbd41022b9fa043d5620d71d968c2d751741a45b7a2175e5b410d42b4a9cc32fb",
+                    "mixHash" : "0x6bc90b3a99e05b254a9fbb282483dd0db2663a983529cacfe180668fb3788c3d",
+                    "nonce" : "0xe70305c88d52281e",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbf97606e56b20491bfbf0c54cd8031ed0e4c9f17c924a9dfe9c54adef14fbf69",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0bf97606e56b20491bfbf0c54cd8031ed0e4c9f17c924a9dfe9c54adef14fbf69a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a06bc90b3a99e05b254a9fbb282483dd0db2663a983529cacfe180668fb3788c3d88e70305c88d52281ef90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0588e608980b267da5171e3e8cc276a9685ce23ad5b3d12de672eae1e855b0045a07c1d03f332558c115c011112f56671417c8e7f8c6517ae0f7df90e5885674706c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x588e608980b267da5171e3e8cc276a9685ce23ad5b3d12de672eae1e855b0045",
+                        "s" : "0x7c1d03f332558c115c011112f56671417c8e7f8c6517ae0f7df90e5885674706",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbd41022b9fa043d5620d71d968c2d751741a45b7a2175e5b410d42b4a9cc32fb",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g3v0.json
index 7a73a41bf..1991a0678 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g3v0Filler.json",
+            "sourceHash" : "9362df3f5c2357b48aa2f9fad9d31ce6aff6724d7d97bfbf58164ddd11fcd140"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x4b9446f44fd946509bb5b974469d301697eb97d36d6f89f6f48562519232710f",
+                    "mixHash" : "0x7f81c17f3a9e6fa1f15442daa90ef6031b634f3a604f4ead77a7c44bf4116dc4",
+                    "nonce" : "0xf671748fcbe81119",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc396861cb69673079dd2fae3a8f87a57455a9563ed2153cdaed65a7aa816b050",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0c396861cb69673079dd2fae3a8f87a57455a9563ed2153cdaed65a7aa816b050a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a07f81c17f3a9e6fa1f15442daa90ef6031b634f3a604f4ead77a7c44bf4116dc488f671748fcbe81119f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca088dd88811c90536a48cdf117eeb3e1e4649d4d4c7097a6d67c6b304b2794555ea0485053724e36c34440493cb0e95f26022429d300827b0140fd7e0c549f6c8476c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x88dd88811c90536a48cdf117eeb3e1e4649d4d4c7097a6d67c6b304b2794555e",
+                        "s" : "0x485053724e36c34440493cb0e95f26022429d300827b0140fd7e0c549f6c8476",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4b9446f44fd946509bb5b974469d301697eb97d36d6f89f6f48562519232710f",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0.json
index 8a291f5ee..d3198372f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_3_5_100_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0Filler.json",
             "sourceHash" : "1665f138200aec29860985588d278e84c7473927477ab885509c19a718467f54"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x5e472f76bb6a383bfa133ab9a21fa2cc3f2127e27e53722171c69557f682c2ef",
-                    "mixHash" : "0xa5e06bb541123d3b7e6c98c818c372152184b9a048b643b36774fe1e3632c6d6",
-                    "nonce" : "0xca9bffbdc71e5ba1",
+                    "hash" : "0xf1e9218f7e4c787a3c3bf2bd5b4251d62cf3b783726dfe5e5d2d49a57b4653b7",
+                    "mixHash" : "0x59b0dd51bf58ae1ebcdf86df0eac5b29e4f00a82135f569069bb2d77c1747034",
+                    "nonce" : "0xb3abb26a82a18609",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0a5e06bb541123d3b7e6c98c818c372152184b9a048b643b36774fe1e3632c6d688ca9bffbdc71e5ba1f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0dba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0da03ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a059b0dd51bf58ae1ebcdf86df0eac5b29e4f00a82135f569069bb2d77c174703488b3abb26a82a18609f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0dba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0da03ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e472f76bb6a383bfa133ab9a21fa2cc3f2127e27e53722171c69557f682c2ef",
+        "lastblockhash" : "0xf1e9218f7e4c787a3c3bf2bd5b4251d62cf3b783726dfe5e5d2d49a57b4653b7",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g1v0.json
index 7a73a41bf..423cf931c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g1v0Filler.json",
+            "sourceHash" : "27701c328d623d3279699f20af0186e354530952abc2f7d0bfe86b0ce92ad715"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xb0a716fd0fb02e1a4d7d450fec1d636aa1fa479138226782e223574d469e8d0d",
+                    "mixHash" : "0xafe81f43420f746af2b3f262af166fb5ebab1d272b5c0a100d1f0367b215ddaa",
+                    "nonce" : "0x94d3ee828cd2a5a4",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf8a95933bfcf2c1548fbb719e71489834c7fc075918807fa2ef7d064f31b4468",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0f8a95933bfcf2c1548fbb719e71489834c7fc075918807fa2ef7d064f31b4468a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0afe81f43420f746af2b3f262af166fb5ebab1d272b5c0a100d1f0367b215ddaa8894d3ee828cd2a5a4f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca062ab6b0f8b2e80a49163c77b074b77c863261268b3cadd851cd172b491638259a02b5f110ddf647ab9ecafc1a2233424a0666e25d8738716f75fae1fe1c70d31e5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x62ab6b0f8b2e80a49163c77b074b77c863261268b3cadd851cd172b491638259",
+                        "s" : "0x2b5f110ddf647ab9ecafc1a2233424a0666e25d8738716f75fae1fe1c70d31e5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb0a716fd0fb02e1a4d7d450fec1d636aa1fa479138226782e223574d469e8d0d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g2v0.json
index 7a73a41bf..1ec0f927c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g2v0Filler.json",
+            "sourceHash" : "2280ceca79b6e4392382a7a9d821f25e008600ef83f53b8a8d640df66ad1146b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xf7d7e9ab2c98cc654ad40421decaadc88ce256813470e82427215e73475c7b7d",
+                    "mixHash" : "0xef4f6a991047560b1c9da63d4ec3128338d5564a542e658a0ca74516b78a2bde",
+                    "nonce" : "0xdb20dc57b3f0f62c",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbf97606e56b20491bfbf0c54cd8031ed0e4c9f17c924a9dfe9c54adef14fbf69",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0bf97606e56b20491bfbf0c54cd8031ed0e4c9f17c924a9dfe9c54adef14fbf69a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0ef4f6a991047560b1c9da63d4ec3128338d5564a542e658a0ca74516b78a2bde88db20dc57b3f0f62cf90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0588e608980b267da5171e3e8cc276a9685ce23ad5b3d12de672eae1e855b0045a07c1d03f332558c115c011112f56671417c8e7f8c6517ae0f7df90e5885674706c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x588e608980b267da5171e3e8cc276a9685ce23ad5b3d12de672eae1e855b0045",
+                        "s" : "0x7c1d03f332558c115c011112f56671417c8e7f8c6517ae0f7df90e5885674706",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf7d7e9ab2c98cc654ad40421decaadc88ce256813470e82427215e73475c7b7d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g3v0.json
index 7a73a41bf..e7b4ecfbb 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_3_5_100_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g3v0Filler.json",
+            "sourceHash" : "42138109bb7e06276e3eb527fadfa80dc946a9c693c014dab53f68e2303e2354"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x6a1a8a1fc75d344c7428bd76eeb5cc7bfd00e23162a0aa3f7e75cd9b38c088e8",
+                    "mixHash" : "0xc95f6fbbcc8341c56d136cd43c1e7767a171149587363ae777517a82dced7367",
+                    "nonce" : "0x5da7dc1102743c6e",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0xf49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc396861cb69673079dd2fae3a8f87a57455a9563ed2153cdaed65a7aa816b050",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f49eaaed5bb9909eb2c71a61aeb584fefd46ef0f4adafa209e977c9de5f4f0c1a0c396861cb69673079dd2fae3a8f87a57455a9563ed2153cdaed65a7aa816b050a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0c95f6fbbcc8341c56d136cd43c1e7767a171149587363ae777517a82dced7367885da7dc1102743c6ef90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca088dd88811c90536a48cdf117eeb3e1e4649d4d4c7097a6d67c6b304b2794555ea0485053724e36c34440493cb0e95f26022429d300827b0140fd7e0c549f6c8476c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x88dd88811c90536a48cdf117eeb3e1e4649d4d4c7097a6d67c6b304b2794555e",
+                        "s" : "0x485053724e36c34440493cb0e95f26022429d300827b0140fd7e0c549f6c8476",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6a1a8a1fc75d344c7428bd76eeb5cc7bfd00e23162a0aa3f7e75cd9b38c088e8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0.json
index e6672b794..b63bf914a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_49_2401_2401_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0Filler.json",
             "sourceHash" : "3a248babd5e7a890104ca8a93ac916def125f1643c79f84bd986f384fe976065"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae13",
-                    "hash" : "0xeae89d0537d7bfebd2bafd94c16ba1c6dfc56e3cd0d7926a802edfcb80cf2096",
-                    "mixHash" : "0x145b207c4300c2a160089747f57ef1ddbbfcc88d108384f1bfb84f478ad5c4b7",
-                    "nonce" : "0x90e876d63036048c",
+                    "hash" : "0xbecd56d2244c4b7d9921d4d80546d9ac1ffdf76f9b623231189f62217ef053fc",
+                    "mixHash" : "0xe153e233461aaf955fc5c74d8b9e561362e17ced7601a4bdf320d32593e80abe",
+                    "nonce" : "0x18abc30dd93bfd2b",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xd2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0d2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23ea0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0145b207c4300c2a160089747f57ef1ddbbfcc88d108384f1bfb84f478ad5c4b78890e876d63036048cf90128f901250101830f9ad894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba0dca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3a0724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4abc0",
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0d2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23ea0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0e153e233461aaf955fc5c74d8b9e561362e17ced7601a4bdf320d32593e80abe8818abc30dd93bfd2bf90128f901250101830f9ad894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba0dca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3a0724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4abc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeae89d0537d7bfebd2bafd94c16ba1c6dfc56e3cd0d7926a802edfcb80cf2096",
+        "lastblockhash" : "0xbecd56d2244c4b7d9921d4d80546d9ac1ffdf76f9b623231189f62217ef053fc",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g1v0.json
index 7a73a41bf..266c85b3d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g1v0Filler.json",
+            "sourceHash" : "4b97e7bed612204e28e56f505152382282f6d128d3e9cc153cf6a36f205b0b1c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0x70028c0ecfaee21bafe30fb756e6ba18fb2554c3709d88350671b0a769c94150",
+                    "mixHash" : "0x2469fdc784f15d7e0975c2e0212f93f58083f06ddd791c8940e423466f434177",
+                    "nonce" : "0x37dca41fec709c03",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc97e80ffc13d5fbbf775b660e05a4b8a3857a56bfcee6cb4e7781bf2dacf2b45",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0c97e80ffc13d5fbbf775b660e05a4b8a3857a56bfcee6cb4e7781bf2dacf2b45a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a02469fdc784f15d7e0975c2e0212f93f58083f06ddd791c8940e423466f4341778837dca41fec709c03f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09998219019132af003a64014150a4dc4e1f442068d7d0b584036fbd98d99da75a03c6ee062a2090a644355365e3b7ccf73eb7d0b7b20de52a0604e58603668b892c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9998219019132af003a64014150a4dc4e1f442068d7d0b584036fbd98d99da75",
+                        "s" : "0x3c6ee062a2090a644355365e3b7ccf73eb7d0b7b20de52a0604e58603668b892",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x70028c0ecfaee21bafe30fb756e6ba18fb2554c3709d88350671b0a769c94150",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g2v0.json
index 7a73a41bf..1323518e3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g2v0Filler.json",
+            "sourceHash" : "d5e3499f566aef8ac350ea9b7654332e1b77ad30e4fd4efb54c656e65cb68a7c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0x6154eb1fc5afa9d3bdbb1e3c2ad82c6fccdb83db65f478d4de8d6c2eb4a2f79d",
+                    "mixHash" : "0x22693f221c3d03363b9047f6a82019a1df5be4b19f369101e2a3f34d30270b84",
+                    "nonce" : "0xea5bb4709223e1c8",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdc8c60758df6fbe47b0cfe97617da36a493639e49e48156ec660d7bc3a7ea4d0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0dc8c60758df6fbe47b0cfe97617da36a493639e49e48156ec660d7bc3a7ea4d0a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a022693f221c3d03363b9047f6a82019a1df5be4b19f369101e2a3f34d30270b8488ea5bb4709223e1c8f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09e8e2b8117fcd87cefbdc02a00e733d3e375c5a04891c45954d467ca86ee02c1a04c62750b147d73a68235f62dd323b2ab77ea988566281fe396c3341c882cbeaec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9e8e2b8117fcd87cefbdc02a00e733d3e375c5a04891c45954d467ca86ee02c1",
+                        "s" : "0x4c62750b147d73a68235f62dd323b2ab77ea988566281fe396c3341c882cbeae",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6154eb1fc5afa9d3bdbb1e3c2ad82c6fccdb83db65f478d4de8d6c2eb4a2f79d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g3v0.json
index 7a73a41bf..970c1e078 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g3v0Filler.json",
+            "sourceHash" : "a54bf52fdf7896a6deb37706a735f92d3384abf161f3eeb5b9840cd16a6a3c74"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0x45a3d14da9421922f79b678333cab34b98b48f1f891412c534f3eaa913a1fc4a",
+                    "mixHash" : "0x5932c5e0a101866c2153894379433a044fe45cb29784318c340c35e114ff2de9",
+                    "nonce" : "0xfb9a887d32e1ed65",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x47e50649762a111d33b6bfc080d390f67f3e03031d43a5d5946bfddb65f932ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a047e50649762a111d33b6bfc080d390f67f3e03031d43a5d5946bfddb65f932cea0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a05932c5e0a101866c2153894379433a044fe45cb29784318c340c35e114ff2de988fb9a887d32e1ed65f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca082e6f22204c2d7679f7ab7a8f6561a26d8ee9e2b4b0d3b93d7c0af5cc0e70b91a0390a239c5286f369014475869a2c8518d5e5c3a9b28bb5862712858fd49fa3f4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x82e6f22204c2d7679f7ab7a8f6561a26d8ee9e2b4b0d3b93d7c0af5cc0e70b91",
+                        "s" : "0x390a239c5286f369014475869a2c8518d5e5c3a9b28bb5862712858fd49fa3f4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x45a3d14da9421922f79b678333cab34b98b48f1f891412c534f3eaa913a1fc4a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0.json
index 07d0404f5..092ef1af4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_49_2401_2401_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0Filler.json",
             "sourceHash" : "ccffb709240ca7c1525253eb5acc8d3726cb2f573ba2b64b89fa72d892936d56"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae13",
-                    "hash" : "0x4f45209c8f7df0581be26cb5d81ae8e14de86991add2a093691cbf630acda54f",
-                    "mixHash" : "0x2d72ba9f717eaf28b33cec0075a13ee8ca5da53d330bca79c664322208d2752d",
-                    "nonce" : "0x7342bed7965dfb5e",
+                    "hash" : "0x0f9dd986a07990ed1353f409f74574b92224a69997f5e1324186b7533a0dfe41",
+                    "mixHash" : "0x27c22e97d079069abdc165def9d528853865a557c1db594e3b2bf82df8483eff",
+                    "nonce" : "0x5b3d9d00bc3ff61c",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x2b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a02b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a02d72ba9f717eaf28b33cec0075a13ee8ca5da53d330bca79c664322208d2752d887342bed7965dfb5ef90128f9012501018302b61094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca011b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797ca02b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6c0",
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a02b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a027c22e97d079069abdc165def9d528853865a557c1db594e3b2bf82df8483eff885b3d9d00bc3ff61cf90128f9012501018302b61094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca011b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797ca02b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f45209c8f7df0581be26cb5d81ae8e14de86991add2a093691cbf630acda54f",
+        "lastblockhash" : "0x0f9dd986a07990ed1353f409f74574b92224a69997f5e1324186b7533a0dfe41",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g1v0.json
index 7a73a41bf..07b444bcc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g1v0Filler.json",
+            "sourceHash" : "288d5bf6521cedd90765929e73a27066408475794f362caf3e33a5effa26f222"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0xe2561247763a908b84220c89949353b8770ce6abfad2bc573842db18e105ac96",
+                    "mixHash" : "0x259e9ebc18585ed3255b732a8221ba6d26481bfdc7f9e6681255e36844128959",
+                    "nonce" : "0xe1d0ac25c6db9e64",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc97e80ffc13d5fbbf775b660e05a4b8a3857a56bfcee6cb4e7781bf2dacf2b45",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0c97e80ffc13d5fbbf775b660e05a4b8a3857a56bfcee6cb4e7781bf2dacf2b45a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0259e9ebc18585ed3255b732a8221ba6d26481bfdc7f9e6681255e3684412895988e1d0ac25c6db9e64f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09998219019132af003a64014150a4dc4e1f442068d7d0b584036fbd98d99da75a03c6ee062a2090a644355365e3b7ccf73eb7d0b7b20de52a0604e58603668b892c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9998219019132af003a64014150a4dc4e1f442068d7d0b584036fbd98d99da75",
+                        "s" : "0x3c6ee062a2090a644355365e3b7ccf73eb7d0b7b20de52a0604e58603668b892",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe2561247763a908b84220c89949353b8770ce6abfad2bc573842db18e105ac96",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g2v0.json
index 7a73a41bf..714be76a3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g2v0Filler.json",
+            "sourceHash" : "9c2348868a79ec842d6cb78d78ee80a6fd881eddc56435de269aaf50355f73b7"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0xd4160c0dc20a11eb37c6f74838dfd5ac9424530c0879d90cda846b9806ac8d2c",
+                    "mixHash" : "0xe0c56434532c848fdeefc475aca62a50cd11a456c6f3a63c5773f2b6b1978fba",
+                    "nonce" : "0x68a40fc6967e2d6c",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdc8c60758df6fbe47b0cfe97617da36a493639e49e48156ec660d7bc3a7ea4d0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0dc8c60758df6fbe47b0cfe97617da36a493639e49e48156ec660d7bc3a7ea4d0a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0e0c56434532c848fdeefc475aca62a50cd11a456c6f3a63c5773f2b6b1978fba8868a40fc6967e2d6cf90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09e8e2b8117fcd87cefbdc02a00e733d3e375c5a04891c45954d467ca86ee02c1a04c62750b147d73a68235f62dd323b2ab77ea988566281fe396c3341c882cbeaec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9e8e2b8117fcd87cefbdc02a00e733d3e375c5a04891c45954d467ca86ee02c1",
+                        "s" : "0x4c62750b147d73a68235f62dd323b2ab77ea988566281fe396c3341c882cbeae",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd4160c0dc20a11eb37c6f74838dfd5ac9424530c0879d90cda846b9806ac8d2c",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g3v0.json
index 7a73a41bf..e4fc91070 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g3v0Filler.json",
+            "sourceHash" : "e77068aa6980e9d9238e69cad51148ee894d63fc7299f36850cd2644de23b5ba"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0x3d04c4b73722420b02df7986bc3566d5411716bcce16890a2353e8b0c6b8f2bf",
+                    "mixHash" : "0x6bbdbb40e2783dce1abb89d0f11ae80b66735a58d0f4c69ba9bd7c7bb2795ae4",
+                    "nonce" : "0x8c3fa293352dc831",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x47e50649762a111d33b6bfc080d390f67f3e03031d43a5d5946bfddb65f932ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a047e50649762a111d33b6bfc080d390f67f3e03031d43a5d5946bfddb65f932cea0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a06bbdbb40e2783dce1abb89d0f11ae80b66735a58d0f4c69ba9bd7c7bb2795ae4888c3fa293352dc831f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca082e6f22204c2d7679f7ab7a8f6561a26d8ee9e2b4b0d3b93d7c0af5cc0e70b91a0390a239c5286f369014475869a2c8518d5e5c3a9b28bb5862712858fd49fa3f4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x82e6f22204c2d7679f7ab7a8f6561a26d8ee9e2b4b0d3b93d7c0af5cc0e70b91",
+                        "s" : "0x390a239c5286f369014475869a2c8518d5e5c3a9b28bb5862712858fd49fa3f4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3d04c4b73722420b02df7986bc3566d5411716bcce16890a2353e8b0c6b8f2bf",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0.json
index 183843556..4082e67fc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_49_2401_2401_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0Filler.json",
             "sourceHash" : "8193bab09e786c3599c0808b21cd7386b07c302683540fbffe6cbfe0634d9a48"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa8ac",
-                    "hash" : "0x2c1170d9518a5b76199da733868aba2051094f349341680875ffc9f0b68694ca",
-                    "mixHash" : "0xa75a1b0dfe490bb64a6e7d267b970cd6430892cad5e1731a1ad6a71950fc4b19",
-                    "nonce" : "0x187a3627da6f2ccc",
+                    "hash" : "0xa576f5c9166e83108fcd7d2ea4cf98b0c5e0b586677d58b99f6d17c855f1b25a",
+                    "mixHash" : "0x0be6dd068b1150281c69a38abcddafe5c33c8a1f91bb201ee8109c0c1d40120e",
+                    "nonce" : "0x7f64f29940f2f366",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0xf5a2cfc96097dbe9e86f4a5c030ce4d35c30103fee5dcb55b72d6383570e3f5d",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xd1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06a71c4195a7316caf348e18062cc80f068192754141cc5a854e38c1d0caad5aaa0d1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4ea0f5a2cfc96097dbe9e86f4a5c030ce4d35c30103fee5dcb55b72d6383570e3f5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8ac8203e880a0a75a1b0dfe490bb64a6e7d267b970cd6430892cad5e1731a1ad6a71950fc4b1988187a3627da6f2cccf90127f90124010182a8ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca0bcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5a024faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637c0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06a71c4195a7316caf348e18062cc80f068192754141cc5a854e38c1d0caad5aaa0d1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4ea0f5a2cfc96097dbe9e86f4a5c030ce4d35c30103fee5dcb55b72d6383570e3f5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8ac8203e880a00be6dd068b1150281c69a38abcddafe5c33c8a1f91bb201ee8109c0c1d40120e887f64f29940f2f366f90127f90124010182a8ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca0bcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5a024faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c1170d9518a5b76199da733868aba2051094f349341680875ffc9f0b68694ca",
+        "lastblockhash" : "0xa576f5c9166e83108fcd7d2ea4cf98b0c5e0b586677d58b99f6d17c855f1b25a",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g1v0.json
index 7a73a41bf..97053bb07 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g1v0Filler.json",
+            "sourceHash" : "2ae9d7f4b44548c492d4e203340752f534e09e760d8595400fd1026ed89a1885"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0xeead8ce3bd3da48e2dede1163db03c28f92b0996d1649311bbd1d197b6a7ce17",
+                    "mixHash" : "0xcd0d16e3bebea3a7b3a6d9ae145528ca474b3f689c461243f9a37ba7f765f3c6",
+                    "nonce" : "0x13fb33f38af76be1",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc97e80ffc13d5fbbf775b660e05a4b8a3857a56bfcee6cb4e7781bf2dacf2b45",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0c97e80ffc13d5fbbf775b660e05a4b8a3857a56bfcee6cb4e7781bf2dacf2b45a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0cd0d16e3bebea3a7b3a6d9ae145528ca474b3f689c461243f9a37ba7f765f3c68813fb33f38af76be1f90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09998219019132af003a64014150a4dc4e1f442068d7d0b584036fbd98d99da75a03c6ee062a2090a644355365e3b7ccf73eb7d0b7b20de52a0604e58603668b892c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9998219019132af003a64014150a4dc4e1f442068d7d0b584036fbd98d99da75",
+                        "s" : "0x3c6ee062a2090a644355365e3b7ccf73eb7d0b7b20de52a0604e58603668b892",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xeead8ce3bd3da48e2dede1163db03c28f92b0996d1649311bbd1d197b6a7ce17",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g2v0.json
index 7a73a41bf..d29b177a4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g2v0Filler.json",
+            "sourceHash" : "eafdd36f9ad63965723553c30004e03c69e24c90d8e5d284748b9ea3fbd9bb74"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0xf3df6272d3102cfa8e8a672e76fcacdc9807dec483514ff57fd01de3ad3804be",
+                    "mixHash" : "0xc33aa52da604172bf01f731fbf22b2c1f3d1110131fc3e32a01a4adfb6caeb3f",
+                    "nonce" : "0xd92625e849c824c9",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdc8c60758df6fbe47b0cfe97617da36a493639e49e48156ec660d7bc3a7ea4d0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0dc8c60758df6fbe47b0cfe97617da36a493639e49e48156ec660d7bc3a7ea4d0a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0c33aa52da604172bf01f731fbf22b2c1f3d1110131fc3e32a01a4adfb6caeb3f88d92625e849c824c9f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09e8e2b8117fcd87cefbdc02a00e733d3e375c5a04891c45954d467ca86ee02c1a04c62750b147d73a68235f62dd323b2ab77ea988566281fe396c3341c882cbeaec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9e8e2b8117fcd87cefbdc02a00e733d3e375c5a04891c45954d467ca86ee02c1",
+                        "s" : "0x4c62750b147d73a68235f62dd323b2ab77ea988566281fe396c3341c882cbeae",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf3df6272d3102cfa8e8a672e76fcacdc9807dec483514ff57fd01de3ad3804be",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g3v0.json
index 7a73a41bf..6af09569d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g3v0Filler.json",
+            "sourceHash" : "9ed68015de0c86a570feacbdc39c411abb13ca4a964dba9033d4c90c6ab5a0c3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0xe239033749409772ef3b72a10c302c8b0fbd3db7978755bcfdca10151ddb29af",
+                    "mixHash" : "0x83ff48e419764a51d4d00135cbaa6ccd2bec4264e8ac4e5b59455ca90cea68a4",
+                    "nonce" : "0xcd07b819e2285a58",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x47e50649762a111d33b6bfc080d390f67f3e03031d43a5d5946bfddb65f932ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a047e50649762a111d33b6bfc080d390f67f3e03031d43a5d5946bfddb65f932cea0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a083ff48e419764a51d4d00135cbaa6ccd2bec4264e8ac4e5b59455ca90cea68a488cd07b819e2285a58f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca082e6f22204c2d7679f7ab7a8f6561a26d8ee9e2b4b0d3b93d7c0af5cc0e70b91a0390a239c5286f369014475869a2c8518d5e5c3a9b28bb5862712858fd49fa3f4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x82e6f22204c2d7679f7ab7a8f6561a26d8ee9e2b4b0d3b93d7c0af5cc0e70b91",
+                        "s" : "0x390a239c5286f369014475869a2c8518d5e5c3a9b28bb5862712858fd49fa3f4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe239033749409772ef3b72a10c302c8b0fbd3db7978755bcfdca10151ddb29af",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0.json
index efd9c4452..78e87eb30 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_49_2401_2401_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0Filler.json",
             "sourceHash" : "9a5a27c90cc8ab60226a9521c534a9f04430b3aadec8eef14e2b93993abad870"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae13",
-                    "hash" : "0x1a6542d0491d2406689d0c5342e1825f466a055e961c55b4841eec1e5003d990",
-                    "mixHash" : "0xd6cd3b5991fc5a76e65c1205ac9ff05017d380563b35daacb115ff3f01d47251",
-                    "nonce" : "0x76604f99ebe018a3",
+                    "hash" : "0x01ccfeaa96429f3ad111ea08f1a8a4c432cdbc129c705e52743647220261e47f",
+                    "mixHash" : "0xfe496d5f8228b281e8af0113170f4689bc54d36e2e4ef9daa3254e8da4665844",
+                    "nonce" : "0x64064f5a37771562",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0d6cd3b5991fc5a76e65c1205ac9ff05017d380563b35daacb115ff3f01d472518876604f99ebe018a3f90127f90124010182ae8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba093790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844a054e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccbc0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0fe496d5f8228b281e8af0113170f4689bc54d36e2e4ef9daa3254e8da46658448864064f5a37771562f90127f90124010182ae8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba093790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844a054e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccbc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a6542d0491d2406689d0c5342e1825f466a055e961c55b4841eec1e5003d990",
+        "lastblockhash" : "0x01ccfeaa96429f3ad111ea08f1a8a4c432cdbc129c705e52743647220261e47f",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g1v0.json
index 7a73a41bf..3978ce865 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g1v0Filler.json",
+            "sourceHash" : "1439689edb4207a1aa1c9d3f80a62d34604251ed5936fb5c5ef6f972eeeaa255"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0x573a0fe160117f9cfd149305e9e0f9efa429a81133beecb2fa3b551e7668f7e0",
+                    "mixHash" : "0xc6242b6f28c7e5790f8f6d5fc7530031edaac2416a594989f005b8c12a399f76",
+                    "nonce" : "0x80f2c69a15e10b9c",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc97e80ffc13d5fbbf775b660e05a4b8a3857a56bfcee6cb4e7781bf2dacf2b45",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0c97e80ffc13d5fbbf775b660e05a4b8a3857a56bfcee6cb4e7781bf2dacf2b45a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0c6242b6f28c7e5790f8f6d5fc7530031edaac2416a594989f005b8c12a399f768880f2c69a15e10b9cf90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09998219019132af003a64014150a4dc4e1f442068d7d0b584036fbd98d99da75a03c6ee062a2090a644355365e3b7ccf73eb7d0b7b20de52a0604e58603668b892c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9998219019132af003a64014150a4dc4e1f442068d7d0b584036fbd98d99da75",
+                        "s" : "0x3c6ee062a2090a644355365e3b7ccf73eb7d0b7b20de52a0604e58603668b892",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x573a0fe160117f9cfd149305e9e0f9efa429a81133beecb2fa3b551e7668f7e0",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g2v0.json
index 7a73a41bf..6ab426449 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g2v0Filler.json",
+            "sourceHash" : "c4f772493102bc72c7e4b44705096af1512d437af1ee968d8254e39af327ee30"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0xd0b2ba8327a0f83997e81c625e4cb7e08eadf5bb5f4f5fd307416429bd83c823",
+                    "mixHash" : "0x81bfe5360bc17b42395e6e6c5f2bcc246f31737f4a29d5238c790ea42471e841",
+                    "nonce" : "0x00669c1925ae5671",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdc8c60758df6fbe47b0cfe97617da36a493639e49e48156ec660d7bc3a7ea4d0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0dc8c60758df6fbe47b0cfe97617da36a493639e49e48156ec660d7bc3a7ea4d0a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a081bfe5360bc17b42395e6e6c5f2bcc246f31737f4a29d5238c790ea42471e8418800669c1925ae5671f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09e8e2b8117fcd87cefbdc02a00e733d3e375c5a04891c45954d467ca86ee02c1a04c62750b147d73a68235f62dd323b2ab77ea988566281fe396c3341c882cbeaec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9e8e2b8117fcd87cefbdc02a00e733d3e375c5a04891c45954d467ca86ee02c1",
+                        "s" : "0x4c62750b147d73a68235f62dd323b2ab77ea988566281fe396c3341c882cbeae",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd0b2ba8327a0f83997e81c625e4cb7e08eadf5bb5f4f5fd307416429bd83c823",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g3v0.json
index 7a73a41bf..b4e960702 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g3v0Filler.json",
+            "sourceHash" : "fce5038178efcaa1371c69cc4383b8f644061e7138d210c81d41af8c577ce88a"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0x42468c4f933df310dddf5cc2c5bba5225524c54dba50251f26e217dc0eaf2df6",
+                    "mixHash" : "0x26a3dd42e735fba9cd10ed39ff01c70ef6cd6bf5a21f577c5009cc63c70b1aee",
+                    "nonce" : "0x3225ac3ba0dcd9dd",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x47e50649762a111d33b6bfc080d390f67f3e03031d43a5d5946bfddb65f932ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a047e50649762a111d33b6bfc080d390f67f3e03031d43a5d5946bfddb65f932cea0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a026a3dd42e735fba9cd10ed39ff01c70ef6cd6bf5a21f577c5009cc63c70b1aee883225ac3ba0dcd9ddf90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca082e6f22204c2d7679f7ab7a8f6561a26d8ee9e2b4b0d3b93d7c0af5cc0e70b91a0390a239c5286f369014475869a2c8518d5e5c3a9b28bb5862712858fd49fa3f4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x82e6f22204c2d7679f7ab7a8f6561a26d8ee9e2b4b0d3b93d7c0af5cc0e70b91",
+                        "s" : "0x390a239c5286f369014475869a2c8518d5e5c3a9b28bb5862712858fd49fa3f4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x42468c4f933df310dddf5cc2c5bba5225524c54dba50251f26e217dc0eaf2df6",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0.json
index fe435a541..d0cb87386 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_49_2401_2401_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0Filler.json",
             "sourceHash" : "fee11d97a487e638b3cd2949107b7f72ea643bb41675dfbb134faf013fe66ded"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae13",
-                    "hash" : "0xc9226017727c45a469b581d174b62c13446482198da5479a81d47ab9abb2f165",
-                    "mixHash" : "0xc318bb7026c77ffc720347fb379f6420a65c9a3bd5a22f4b5117c3100c7e325b",
-                    "nonce" : "0x1e246592a20eb7ec",
+                    "hash" : "0xa2390423b03748a1f42556539aba739ed43a0ad88eccf2cb167c18f8961759eb",
+                    "mixHash" : "0x8ff5c42b7c4b44a63b303f64c0e380d35f995279b33f8ae1c5ef3c0a5ada53d8",
+                    "nonce" : "0xe1c81da340aca508",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x4d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a04d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eba0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0c318bb7026c77ffc720347fb379f6420a65c9a3bd5a22f4b5117c3100c7e325b881e246592a20eb7ecf90127f90124010182ba4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba098d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376a0337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0c0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a04d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eba0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a08ff5c42b7c4b44a63b303f64c0e380d35f995279b33f8ae1c5ef3c0a5ada53d888e1c81da340aca508f90127f90124010182ba4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba098d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376a0337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc9226017727c45a469b581d174b62c13446482198da5479a81d47ab9abb2f165",
+        "lastblockhash" : "0xa2390423b03748a1f42556539aba739ed43a0ad88eccf2cb167c18f8961759eb",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g1v0.json
index 7a73a41bf..f1dd5ecbc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g1v0Filler.json",
+            "sourceHash" : "11c12c6071395f6ff18dd0c8eba51a4b2a5dc478f909736720bab14a4cdaa985"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0x5d2fac9a040a604626d63f03936a1b1bee8baa2f69ff4d60571905f7369a553b",
+                    "mixHash" : "0xcc819ce1f51dd931c69ceb551fe79a7feb420d5bb00c5a8fd3c570ac5bd81c5b",
+                    "nonce" : "0x5a79839523d623fe",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc97e80ffc13d5fbbf775b660e05a4b8a3857a56bfcee6cb4e7781bf2dacf2b45",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0c97e80ffc13d5fbbf775b660e05a4b8a3857a56bfcee6cb4e7781bf2dacf2b45a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0cc819ce1f51dd931c69ceb551fe79a7feb420d5bb00c5a8fd3c570ac5bd81c5b885a79839523d623fef90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09998219019132af003a64014150a4dc4e1f442068d7d0b584036fbd98d99da75a03c6ee062a2090a644355365e3b7ccf73eb7d0b7b20de52a0604e58603668b892c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9998219019132af003a64014150a4dc4e1f442068d7d0b584036fbd98d99da75",
+                        "s" : "0x3c6ee062a2090a644355365e3b7ccf73eb7d0b7b20de52a0604e58603668b892",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5d2fac9a040a604626d63f03936a1b1bee8baa2f69ff4d60571905f7369a553b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g2v0.json
index 7a73a41bf..6f9a56b7d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g2v0Filler.json",
+            "sourceHash" : "c6c0ac7305d62f31962acecd872f1bf2cccba3a9a5c8c848e3eb17b4370b42cb"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0x738c4bf91ea38c8e82760b1da86e2493690283b1fc95ddf329161d1bbd971da0",
+                    "mixHash" : "0xe914df0dabf866e2ae5c26fdb7539df3324183e7d990a3f96c98d315b377d403",
+                    "nonce" : "0xb945784516d28760",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdc8c60758df6fbe47b0cfe97617da36a493639e49e48156ec660d7bc3a7ea4d0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0dc8c60758df6fbe47b0cfe97617da36a493639e49e48156ec660d7bc3a7ea4d0a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0e914df0dabf866e2ae5c26fdb7539df3324183e7d990a3f96c98d315b377d40388b945784516d28760f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09e8e2b8117fcd87cefbdc02a00e733d3e375c5a04891c45954d467ca86ee02c1a04c62750b147d73a68235f62dd323b2ab77ea988566281fe396c3341c882cbeaec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9e8e2b8117fcd87cefbdc02a00e733d3e375c5a04891c45954d467ca86ee02c1",
+                        "s" : "0x4c62750b147d73a68235f62dd323b2ab77ea988566281fe396c3341c882cbeae",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x738c4bf91ea38c8e82760b1da86e2493690283b1fc95ddf329161d1bbd971da0",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g3v0.json
index 7a73a41bf..2d21aef83 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g3v0Filler.json",
+            "sourceHash" : "d5836e894a3dfa7e198bdc3b3a1af2f72d002002e70bf58d338a0acd1bfb74dd"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0xa6f8d33c0fb6f0135d5cc24ddf85acda32982616870996bef5aa169d98d0b708",
+                    "mixHash" : "0xd531a606c4abbcf3ada82c6475da911564c681919fc8cb704d8a9fa5933cac62",
+                    "nonce" : "0x703809350643a347",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x47e50649762a111d33b6bfc080d390f67f3e03031d43a5d5946bfddb65f932ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a047e50649762a111d33b6bfc080d390f67f3e03031d43a5d5946bfddb65f932cea0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0d531a606c4abbcf3ada82c6475da911564c681919fc8cb704d8a9fa5933cac6288703809350643a347f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca082e6f22204c2d7679f7ab7a8f6561a26d8ee9e2b4b0d3b93d7c0af5cc0e70b91a0390a239c5286f369014475869a2c8518d5e5c3a9b28bb5862712858fd49fa3f4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x82e6f22204c2d7679f7ab7a8f6561a26d8ee9e2b4b0d3b93d7c0af5cc0e70b91",
+                        "s" : "0x390a239c5286f369014475869a2c8518d5e5c3a9b28bb5862712858fd49fa3f4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa6f8d33c0fb6f0135d5cc24ddf85acda32982616870996bef5aa169d98d0b708",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0.json
index 74e65d2cd..a89a61ecb 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_49_2401_2401_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0Filler.json",
             "sourceHash" : "3f2ac9122dd0276612a1f14945a18c20493434cfcadacc450c62e5a7c670a40c"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae13",
-                    "hash" : "0x5f0da8dcee7ebca33ffc0ee5b8198cb6ef0abd40906e2bcfa459e26c7a607ad8",
-                    "mixHash" : "0x1fb5f1446148b8bc7b148f81916ec71cfc7380760aed388c63bfda2514b969c5",
-                    "nonce" : "0x4ff1508c51016e16",
+                    "hash" : "0x3b8d84b286873d1049948acfce05cd01b26c9d3bc1d9a4eb360d7b23bc2d6ae5",
+                    "mixHash" : "0xc0c099699d144ec33ff022855fcb1e527c4d695f5da1134f5455db87adab844e",
+                    "nonce" : "0x39df4373d58451d2",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xbb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0bb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8fa0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a01fb5f1446148b8bc7b148f81916ec71cfc7380760aed388c63bfda2514b969c5884ff1508c51016e16f90127f90124010182e15094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77a05af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51cc0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0bb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8fa0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0c0c099699d144ec33ff022855fcb1e527c4d695f5da1134f5455db87adab844e8839df4373d58451d2f90127f90124010182e15094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77a05af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f0da8dcee7ebca33ffc0ee5b8198cb6ef0abd40906e2bcfa459e26c7a607ad8",
+        "lastblockhash" : "0x3b8d84b286873d1049948acfce05cd01b26c9d3bc1d9a4eb360d7b23bc2d6ae5",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g1v0.json
index 7a73a41bf..6c7de1eb1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g1v0Filler.json",
+            "sourceHash" : "fd1b0df5424983fa90c0015ce4f195bcec3cde17de842a65872d5b8aa72957c9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0x78fcfb779f1955d3f877597ac6ac69cbc32534908c222e11505b6e430c41b1ed",
+                    "mixHash" : "0x922ff33bf0807e80466bb20d44ab8d51ff0f788ddb8ee7724dbdb8590ec5604c",
+                    "nonce" : "0x1702e21fe3b3bcdb",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc97e80ffc13d5fbbf775b660e05a4b8a3857a56bfcee6cb4e7781bf2dacf2b45",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0c97e80ffc13d5fbbf775b660e05a4b8a3857a56bfcee6cb4e7781bf2dacf2b45a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0922ff33bf0807e80466bb20d44ab8d51ff0f788ddb8ee7724dbdb8590ec5604c881702e21fe3b3bcdbf90128f90125010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09998219019132af003a64014150a4dc4e1f442068d7d0b584036fbd98d99da75a03c6ee062a2090a644355365e3b7ccf73eb7d0b7b20de52a0604e58603668b892c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9998219019132af003a64014150a4dc4e1f442068d7d0b584036fbd98d99da75",
+                        "s" : "0x3c6ee062a2090a644355365e3b7ccf73eb7d0b7b20de52a0604e58603668b892",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x78fcfb779f1955d3f877597ac6ac69cbc32534908c222e11505b6e430c41b1ed",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g2v0.json
index 7a73a41bf..c321fcd35 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g2v0Filler.json",
+            "sourceHash" : "c40c4ca419d8043f1a502892931903a7402651dcc36b679c14cae77b7eba55f3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0x24461cb9fdc6b3c351e66cbea656123affdb2f8703eb84f78cd779dc0ec8ee12",
+                    "mixHash" : "0x3086eee3b5dc99761e70be7669684e0ba0ca2a1bc10c4f235bd6b70b853c1a13",
+                    "nonce" : "0x1e52258b0226f861",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdc8c60758df6fbe47b0cfe97617da36a493639e49e48156ec660d7bc3a7ea4d0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a0dc8c60758df6fbe47b0cfe97617da36a493639e49e48156ec660d7bc3a7ea4d0a0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a03086eee3b5dc99761e70be7669684e0ba0ca2a1bc10c4f235bd6b70b853c1a13881e52258b0226f861f90128f9012501018301adb094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09e8e2b8117fcd87cefbdc02a00e733d3e375c5a04891c45954d467ca86ee02c1a04c62750b147d73a68235f62dd323b2ab77ea988566281fe396c3341c882cbeaec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9e8e2b8117fcd87cefbdc02a00e733d3e375c5a04891c45954d467ca86ee02c1",
+                        "s" : "0x4c62750b147d73a68235f62dd323b2ab77ea988566281fe396c3341c882cbeae",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x24461cb9fdc6b3c351e66cbea656123affdb2f8703eb84f78cd779dc0ec8ee12",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g3v0.json
index 7a73a41bf..156b50688 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_49_2401_2401_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g3v0Filler.json",
+            "sourceHash" : "87dba258eb3bea5a51736a65b26bd5e420797f08f4f93a75e41877921ea460b9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae13",
+                    "hash" : "0x5d7ed1f0a339355b194eb244fdad784aebb8d332b4bc12a8c6e0f0219a5b0da3",
+                    "mixHash" : "0xdf558fa444cef36a928a7db6c9e49812179172d2cf2c9e15d16ba7e9e7e3d70a",
+                    "nonce" : "0xd893f8e6756d2862",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20",
+                    "stateRoot" : "0x636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x47e50649762a111d33b6bfc080d390f67f3e03031d43a5d5946bfddb65f932ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0636fcb36d84a328dfed6271bacd92f6b7bcc08c7b5fd4bc8a951aa8896d95545a047e50649762a111d33b6bfc080d390f67f3e03031d43a5d5946bfddb65f932cea0894bfe8993f2a3eda187079dd84e45151d80629d5c74c6b1b2cf5ec3cb9c9e20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae138203e880a0df558fa444cef36a928a7db6c9e49812179172d2cf2c9e15d16ba7e9e7e3d70a88d893f8e6756d2862f90128f90125010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca082e6f22204c2d7679f7ab7a8f6561a26d8ee9e2b4b0d3b93d7c0af5cc0e70b91a0390a239c5286f369014475869a2c8518d5e5c3a9b28bb5862712858fd49fa3f4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x82e6f22204c2d7679f7ab7a8f6561a26d8ee9e2b4b0d3b93d7c0af5cc0e70b91",
+                        "s" : "0x390a239c5286f369014475869a2c8518d5e5c3a9b28bb5862712858fd49fa3f4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5d7ed1f0a339355b194eb244fdad784aebb8d332b4bc12a8c6e0f0219a5b0da3",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0.json
index 9bdd62a0d..9152811a9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_55190_55190_42965_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0Filler.json",
             "sourceHash" : "d6b30bc099eba2538ecf01a17071181d58e4fe4d37e0f6b6f5fa9a4e9b6c08c3"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf577",
-                    "hash" : "0x4e5de67882f753e5e8ff34b3a500957441c3e50988b6280a180bbd7ade7148cf",
-                    "mixHash" : "0x2264b903898cf027152f79135e6f2b249172999f384da13e95f96d46c17380c3",
-                    "nonce" : "0x237e4e475f6aa9b6",
+                    "hash" : "0x650f5bc57490e31e7f4a687c13ce127ea29b3c3570b0f54c0777f8da7ba6ae0f",
+                    "mixHash" : "0xabdaa054ed1a060b9d03bc50671d341b2516956f0d77a72615cdb2bc89221c4f",
+                    "nonce" : "0xb69112ab20dc1b2f",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xa3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0a3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4a0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a02264b903898cf027152f79135e6f2b249172999f384da13e95f96d46c17380c388237e4e475f6aa9b6f90169f901660101830faf9894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5a063ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68c0",
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0a3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4a0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a0abdaa054ed1a060b9d03bc50671d341b2516956f0d77a72615cdb2bc89221c4f88b69112ab20dc1b2ff90169f901660101830faf9894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5a063ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e5de67882f753e5e8ff34b3a500957441c3e50988b6280a180bbd7ade7148cf",
+        "lastblockhash" : "0x650f5bc57490e31e7f4a687c13ce127ea29b3c3570b0f54c0777f8da7ba6ae0f",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g1v0.json
index 7a73a41bf..9f5093164 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g1v0Filler.json",
+            "sourceHash" : "e6165e049994f447b687a1ab9ad3f560075b6a981c94a5455156cb07df986f7b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0xba64175ca3bd99c19ac219a8feb72ee821d298b7571bf11d7b57c926ebb3cdc8",
+                    "mixHash" : "0x3fb8149b574c00aefbd4a2d665c07dd4615b06e5fc5e37cd22bb4ec8ed9c1618",
+                    "nonce" : "0xecd70c7a3494e782",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd87c9755af3d7d8d7a4f6b0bd33075093fa670d3eb013b9246b73cfbcb7ca7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0d87c9755af3d7d8d7a4f6b0bd33075093fa670d3eb013b9246b73cfbcb7ca7cea0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a03fb8149b574c00aefbd4a2d665c07dd4615b06e5fc5e37cd22bb4ec8ed9c161888ecd70c7a3494e782f90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0398199221504e2121b759deb19ac369f7a67f4e7eb1f85fbc37d0c03be377670a0720a67f541ef0846692585d5f42be4777c7640021778ffeb134840a4d81b923ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x398199221504e2121b759deb19ac369f7a67f4e7eb1f85fbc37d0c03be377670",
+                        "s" : "0x720a67f541ef0846692585d5f42be4777c7640021778ffeb134840a4d81b923e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xba64175ca3bd99c19ac219a8feb72ee821d298b7571bf11d7b57c926ebb3cdc8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g2v0.json
index 7a73a41bf..cbacca453 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g2v0Filler.json",
+            "sourceHash" : "5038cd4166339eb40e4507db00d442951830adee7f16226a18db4f66ea7739c4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0x4b5f1923ef659c9c69e4ecaffc6341ea94acbf247bf182e26f620cdacd204ffa",
+                    "mixHash" : "0x9b6dd09ab07e9437ef3157cb5ae77ea979f26f1462e0fd8c6ad368ecaa45b7aa",
+                    "nonce" : "0xa7806e5b7dc84809",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x591a9db175e93fc59fe2826d1b1526bf21f444a59c17ac484f44fcee7e3f7e8c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0591a9db175e93fc59fe2826d1b1526bf21f444a59c17ac484f44fcee7e3f7e8ca0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a09b6dd09ab07e9437ef3157cb5ae77ea979f26f1462e0fd8c6ad368ecaa45b7aa88a7806e5b7dc84809f90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ee598a9b75bcce79297017b71641bdeaa58a6b82fc99f598b054b8144d91aebda07b05966e5c6b62f92af5ff3e2aaf188d93c24ec2a0a0e4e7f9434d1ffb7af186c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xee598a9b75bcce79297017b71641bdeaa58a6b82fc99f598b054b8144d91aebd",
+                        "s" : "0x7b05966e5c6b62f92af5ff3e2aaf188d93c24ec2a0a0e4e7f9434d1ffb7af186",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4b5f1923ef659c9c69e4ecaffc6341ea94acbf247bf182e26f620cdacd204ffa",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g3v0.json
index 7a73a41bf..0e62f37da 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g3v0Filler.json",
+            "sourceHash" : "5b03982c52c40ea3c319024cf1e844dc72597b7da4d23350bbd7d758367fbe11"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0xb28b9ffdde39c01fb4f51f268e26e1fe6d7d30d685fd71feade5eaea941ea6ee",
+                    "mixHash" : "0x4026cebc6bab5bf2efc43470b4a15b51cd57660393fd1a0793c02532d3e80272",
+                    "nonce" : "0x9bcb28771a8df945",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x87295d263cb4afaec4f395cdd8b2481cfcaf86e89dc65a8320ca1cb42d864f60",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a087295d263cb4afaec4f395cdd8b2481cfcaf86e89dc65a8320ca1cb42d864f60a0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a04026cebc6bab5bf2efc43470b4a15b51cd57660393fd1a0793c02532d3e80272889bcb28771a8df945f90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca04faa0819d25c04398cdd4c33163a124bca92b055ef7afd6ce46a361e57414fcba07f54dff2958620182cead0730b80582e7c4350c26020991df5414e56fcb0afa1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4faa0819d25c04398cdd4c33163a124bca92b055ef7afd6ce46a361e57414fcb",
+                        "s" : "0x7f54dff2958620182cead0730b80582e7c4350c26020991df5414e56fcb0afa1",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb28b9ffdde39c01fb4f51f268e26e1fe6d7d30d685fd71feade5eaea941ea6ee",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0.json
index 85f04c37b..bcfd42b2a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_55190_55190_42965_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0Filler.json",
             "sourceHash" : "12d626b1b497891ad32cc9eb8c2597287fb9165c1e9fd11fc2507b28dd494a85"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf577",
-                    "hash" : "0x04a895b40439c7255c9f3091576192fa6c4e745e5481c55c0642f7642c8bdde7",
-                    "mixHash" : "0xa1f0ea5bc5db74e3f62656a44f40ee586be64f0a9467b61453239d19b92d5f12",
-                    "nonce" : "0x3505f6eebc108f1f",
+                    "hash" : "0xd3c2c6d8725c2c84ac467b157cc1cb110d9cc6ede3eafb374366b4d86d3a684a",
+                    "mixHash" : "0xc4f6cee631ffbb1a55cd1362740cd639312cc01653dd5c18b204a0aa26b800a8",
+                    "nonce" : "0xa110f70b316cd8b7",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xde9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0de9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84a0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a0a1f0ea5bc5db74e3f62656a44f40ee586be64f0a9467b61453239d19b92d5f12883505f6eebc108f1ff90169f9016601018302cad094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0f5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4da03c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874c0",
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0de9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84a0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a0c4f6cee631ffbb1a55cd1362740cd639312cc01653dd5c18b204a0aa26b800a888a110f70b316cd8b7f90169f9016601018302cad094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0f5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4da03c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04a895b40439c7255c9f3091576192fa6c4e745e5481c55c0642f7642c8bdde7",
+        "lastblockhash" : "0xd3c2c6d8725c2c84ac467b157cc1cb110d9cc6ede3eafb374366b4d86d3a684a",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g1v0.json
index 7a73a41bf..7b2ca2bb4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g1v0Filler.json",
+            "sourceHash" : "0e679aa0c5eed492251f94d75aa33d18d52ebc4c87d82c324fe654242d957bc4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0xd5ea09c836f7f215be09b346f1779bcdf9daa728960937f3604c890bf31cd566",
+                    "mixHash" : "0x1efcd1c57c0d517fb32377af7da6c6cff861b70b4de16cb2ac524c915b87ee4d",
+                    "nonce" : "0x25ffdc6be25ad01f",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd87c9755af3d7d8d7a4f6b0bd33075093fa670d3eb013b9246b73cfbcb7ca7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0d87c9755af3d7d8d7a4f6b0bd33075093fa670d3eb013b9246b73cfbcb7ca7cea0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a01efcd1c57c0d517fb32377af7da6c6cff861b70b4de16cb2ac524c915b87ee4d8825ffdc6be25ad01ff90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0398199221504e2121b759deb19ac369f7a67f4e7eb1f85fbc37d0c03be377670a0720a67f541ef0846692585d5f42be4777c7640021778ffeb134840a4d81b923ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x398199221504e2121b759deb19ac369f7a67f4e7eb1f85fbc37d0c03be377670",
+                        "s" : "0x720a67f541ef0846692585d5f42be4777c7640021778ffeb134840a4d81b923e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd5ea09c836f7f215be09b346f1779bcdf9daa728960937f3604c890bf31cd566",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g2v0.json
index 7a73a41bf..877ab75ac 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g2v0Filler.json",
+            "sourceHash" : "7028bfc08f1bd812ccaed88f1fd269ffcd058642e285e586b2c1ab70b926cca2"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0x7e64d443c0cda341e91d3766cbbcd18f86923c59c34bb2c2e07a551a5284b1a3",
+                    "mixHash" : "0xc2e7c7fa1211190931277f58edb253b77307b3a64719be807be91ee36181a4f1",
+                    "nonce" : "0xea1fa061a386ccd2",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x591a9db175e93fc59fe2826d1b1526bf21f444a59c17ac484f44fcee7e3f7e8c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0591a9db175e93fc59fe2826d1b1526bf21f444a59c17ac484f44fcee7e3f7e8ca0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a0c2e7c7fa1211190931277f58edb253b77307b3a64719be807be91ee36181a4f188ea1fa061a386ccd2f90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ee598a9b75bcce79297017b71641bdeaa58a6b82fc99f598b054b8144d91aebda07b05966e5c6b62f92af5ff3e2aaf188d93c24ec2a0a0e4e7f9434d1ffb7af186c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xee598a9b75bcce79297017b71641bdeaa58a6b82fc99f598b054b8144d91aebd",
+                        "s" : "0x7b05966e5c6b62f92af5ff3e2aaf188d93c24ec2a0a0e4e7f9434d1ffb7af186",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7e64d443c0cda341e91d3766cbbcd18f86923c59c34bb2c2e07a551a5284b1a3",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g3v0.json
index 7a73a41bf..ea51814c5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g3v0Filler.json",
+            "sourceHash" : "d5c9b24612f5bd90a3a020ac0c55db68d7a6570df5fe6f232a4ae7e64bae0037"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0xb4127134b023904c070a4a2f089cbb8f35b983e29a9c37ec7ceee29ce5717e78",
+                    "mixHash" : "0xf26284b1b15b3311d628a5f52ca5d426ffb5258d2c4361dd385952454669e2c0",
+                    "nonce" : "0x4f80d6647882b151",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x87295d263cb4afaec4f395cdd8b2481cfcaf86e89dc65a8320ca1cb42d864f60",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a087295d263cb4afaec4f395cdd8b2481cfcaf86e89dc65a8320ca1cb42d864f60a0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a0f26284b1b15b3311d628a5f52ca5d426ffb5258d2c4361dd385952454669e2c0884f80d6647882b151f90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca04faa0819d25c04398cdd4c33163a124bca92b055ef7afd6ce46a361e57414fcba07f54dff2958620182cead0730b80582e7c4350c26020991df5414e56fcb0afa1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4faa0819d25c04398cdd4c33163a124bca92b055ef7afd6ce46a361e57414fcb",
+                        "s" : "0x7f54dff2958620182cead0730b80582e7c4350c26020991df5414e56fcb0afa1",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb4127134b023904c070a4a2f089cbb8f35b983e29a9c37ec7ceee29ce5717e78",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0.json
index cce23153b..ab1f09326 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_55190_55190_42965_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0Filler.json",
             "sourceHash" : "e1629ff50f02c723eb73802a1a2ecb959d52d4dab35d57087e189aaf6be4dc7f"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xbd6c",
-                    "hash" : "0xcd9c7609ad07dbd9b289361afbeb0a9445ad05d7430d852277b3e64823c5fe92",
-                    "mixHash" : "0x78331455e2860913d5ee1d56c135de5250dae01f923b5047192b873f1ead508a",
-                    "nonce" : "0xcfe29d5522d39eaf",
+                    "hash" : "0x4d89420d62189db33524082551c85365a48934794a10248d2eb857fb1b84991d",
+                    "mixHash" : "0x5f11ab11a273e982116ecdc075315c7b507b7fe86a2a62dbac00623a3dfc5c6e",
+                    "nonce" : "0x46e1a5f51aeb7aff",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0xb07a68dff031d3034ec3bd4033909a9624fc834062f035e09dd9491a4f79d79d",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xf24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01d4a9cf85f36f24319a5ba866e33839e0aa288a0593082a5d58f5e7d1163b9f9a0f24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88a0b07a68dff031d3034ec3bd4033909a9624fc834062f035e09dd9491a4f79d79db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bd6c8203e880a078331455e2860913d5ee1d56c135de5250dae01f923b5047192b873f1ead508a88cfe29d5522d39eaff90168f90165010182bd6c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba02cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83fa0256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01d4a9cf85f36f24319a5ba866e33839e0aa288a0593082a5d58f5e7d1163b9f9a0f24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88a0b07a68dff031d3034ec3bd4033909a9624fc834062f035e09dd9491a4f79d79db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bd6c8203e880a05f11ab11a273e982116ecdc075315c7b507b7fe86a2a62dbac00623a3dfc5c6e8846e1a5f51aeb7afff90168f90165010182bd6c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba02cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83fa0256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd9c7609ad07dbd9b289361afbeb0a9445ad05d7430d852277b3e64823c5fe92",
+        "lastblockhash" : "0x4d89420d62189db33524082551c85365a48934794a10248d2eb857fb1b84991d",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g1v0.json
index 7a73a41bf..e7fef7489 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g1v0Filler.json",
+            "sourceHash" : "e44c45d25ef6bf8cc39e743f36cafc66108189944309558b601fea427473c3eb"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0x72d29a6ae61a39a8fa8b8d0fc5fce317bccaeff74af1175631f920a84b52f8a7",
+                    "mixHash" : "0x071c7e0937e6e1ef622913a97bbd408d87740201050604e68bb30d5294001a89",
+                    "nonce" : "0x6fdd14b3df3aad2d",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd87c9755af3d7d8d7a4f6b0bd33075093fa670d3eb013b9246b73cfbcb7ca7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0d87c9755af3d7d8d7a4f6b0bd33075093fa670d3eb013b9246b73cfbcb7ca7cea0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a0071c7e0937e6e1ef622913a97bbd408d87740201050604e68bb30d5294001a89886fdd14b3df3aad2df90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0398199221504e2121b759deb19ac369f7a67f4e7eb1f85fbc37d0c03be377670a0720a67f541ef0846692585d5f42be4777c7640021778ffeb134840a4d81b923ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x398199221504e2121b759deb19ac369f7a67f4e7eb1f85fbc37d0c03be377670",
+                        "s" : "0x720a67f541ef0846692585d5f42be4777c7640021778ffeb134840a4d81b923e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x72d29a6ae61a39a8fa8b8d0fc5fce317bccaeff74af1175631f920a84b52f8a7",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g2v0.json
index 7a73a41bf..e5c760e3e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g2v0Filler.json",
+            "sourceHash" : "1c46cc1fb17a2db107bac165f2b58ded2d24a10c242688d6220231346309f788"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0xd552b2b114fc617742d9495c91b0bf507b6e823acf9650334b62d1c22b948307",
+                    "mixHash" : "0x8fd6ef8e2d4cdaeb5fd8598933c0c82ac28a62e0ce300fabd8e719978abe383f",
+                    "nonce" : "0x996e0f78453063c0",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x591a9db175e93fc59fe2826d1b1526bf21f444a59c17ac484f44fcee7e3f7e8c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0591a9db175e93fc59fe2826d1b1526bf21f444a59c17ac484f44fcee7e3f7e8ca0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a08fd6ef8e2d4cdaeb5fd8598933c0c82ac28a62e0ce300fabd8e719978abe383f88996e0f78453063c0f90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ee598a9b75bcce79297017b71641bdeaa58a6b82fc99f598b054b8144d91aebda07b05966e5c6b62f92af5ff3e2aaf188d93c24ec2a0a0e4e7f9434d1ffb7af186c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xee598a9b75bcce79297017b71641bdeaa58a6b82fc99f598b054b8144d91aebd",
+                        "s" : "0x7b05966e5c6b62f92af5ff3e2aaf188d93c24ec2a0a0e4e7f9434d1ffb7af186",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd552b2b114fc617742d9495c91b0bf507b6e823acf9650334b62d1c22b948307",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g3v0.json
index 7a73a41bf..f6f925f2f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g3v0Filler.json",
+            "sourceHash" : "ea54e789d206e323b6d5bcdf6c51b002834ee02ff7f6cb5b81573f8c3f15ba88"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0x72f0128d9a233669e998c780ba83a1bca1e93d0160eff5546d737cd0f485fc29",
+                    "mixHash" : "0x33a61f9426242210aa8e2de1086f67cc290dd3ef9afbfa0e454b2a9cac26e9c6",
+                    "nonce" : "0xc09df8707be697d7",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x87295d263cb4afaec4f395cdd8b2481cfcaf86e89dc65a8320ca1cb42d864f60",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a087295d263cb4afaec4f395cdd8b2481cfcaf86e89dc65a8320ca1cb42d864f60a0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a033a61f9426242210aa8e2de1086f67cc290dd3ef9afbfa0e454b2a9cac26e9c688c09df8707be697d7f90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca04faa0819d25c04398cdd4c33163a124bca92b055ef7afd6ce46a361e57414fcba07f54dff2958620182cead0730b80582e7c4350c26020991df5414e56fcb0afa1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4faa0819d25c04398cdd4c33163a124bca92b055ef7afd6ce46a361e57414fcb",
+                        "s" : "0x7f54dff2958620182cead0730b80582e7c4350c26020991df5414e56fcb0afa1",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x72f0128d9a233669e998c780ba83a1bca1e93d0160eff5546d737cd0f485fc29",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0.json
index b40ac8488..141570f5e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_55190_55190_42965_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0Filler.json",
             "sourceHash" : "4bfe530795a7284f2543b0192ed859ac712242251638348a98af9a00a9078122"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xc348",
-                    "hash" : "0xc0dc0733830fbfebc782c22df099382bbde0a62c419e9d64530cbdfa469cc7ba",
-                    "mixHash" : "0xa44a2484d8aca3026042a438953f3530de288d5a101453c23dadff879b4f6a01",
-                    "nonce" : "0x929aa91dd81df3b9",
+                    "hash" : "0x85aadc67130786cc10938b449f19cd8634cc16a8b232426b03e8473b8735a754",
+                    "mixHash" : "0x1bb6591d59bd83bd9cca1c615bfa2a163e95820f71231f3aab41892e85d53c26",
+                    "nonce" : "0x48fdbe63f51c0141",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0x3c9dddd80d6e393cbff706a289e2d6ef72843a102b9826c56781c6ea379f450f",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b49a2fb4d894370ddcd068e73296d4d25653ae9b3806837b95f6ca41f5cf9f1a0ec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5a03c9dddd80d6e393cbff706a289e2d6ef72843a102b9826c56781c6ea379f450fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c3488203e880a0a44a2484d8aca3026042a438953f3530de288d5a101453c23dadff879b4f6a0188929aa91dd81df3b9f90168f90165010182c34894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba067ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070ea005aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b49a2fb4d894370ddcd068e73296d4d25653ae9b3806837b95f6ca41f5cf9f1a0ec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5a03c9dddd80d6e393cbff706a289e2d6ef72843a102b9826c56781c6ea379f450fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c3488203e880a01bb6591d59bd83bd9cca1c615bfa2a163e95820f71231f3aab41892e85d53c268848fdbe63f51c0141f90168f90165010182c34894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba067ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070ea005aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0dc0733830fbfebc782c22df099382bbde0a62c419e9d64530cbdfa469cc7ba",
+        "lastblockhash" : "0x85aadc67130786cc10938b449f19cd8634cc16a8b232426b03e8473b8735a754",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g1v0.json
index 7a73a41bf..8b20558db 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g1v0Filler.json",
+            "sourceHash" : "1e518233ebd9add2f87dfa0e2b6ecc180637bb8003801cbb80b0d081ca8f95cb"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0x2334566b071f90e2515747cbcaf7364a30e3dafc104c903f9bd1b9102b81e0ca",
+                    "mixHash" : "0x87950df77559a2a1b611fb65515e05763ba354c7e0720e25622e3e247ac00b8d",
+                    "nonce" : "0x327f96d84d0cb92b",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd87c9755af3d7d8d7a4f6b0bd33075093fa670d3eb013b9246b73cfbcb7ca7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0d87c9755af3d7d8d7a4f6b0bd33075093fa670d3eb013b9246b73cfbcb7ca7cea0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a087950df77559a2a1b611fb65515e05763ba354c7e0720e25622e3e247ac00b8d88327f96d84d0cb92bf90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0398199221504e2121b759deb19ac369f7a67f4e7eb1f85fbc37d0c03be377670a0720a67f541ef0846692585d5f42be4777c7640021778ffeb134840a4d81b923ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x398199221504e2121b759deb19ac369f7a67f4e7eb1f85fbc37d0c03be377670",
+                        "s" : "0x720a67f541ef0846692585d5f42be4777c7640021778ffeb134840a4d81b923e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2334566b071f90e2515747cbcaf7364a30e3dafc104c903f9bd1b9102b81e0ca",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g2v0.json
index 7a73a41bf..25841a0ca 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g2v0Filler.json",
+            "sourceHash" : "391129adc0e448845f99b7a5a789a86945c3f2305a054eacf1764c6af6c8be72"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0xd09b0e497bfb3a9385277710d1b1058b1a2a4d251773ac3266c1e1743d83bb6d",
+                    "mixHash" : "0x92e2a4fdee19da23696d7271b375db6452bb1772a2bde5dfeb785c33b1c1a598",
+                    "nonce" : "0x4cf281b57f31301b",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x591a9db175e93fc59fe2826d1b1526bf21f444a59c17ac484f44fcee7e3f7e8c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0591a9db175e93fc59fe2826d1b1526bf21f444a59c17ac484f44fcee7e3f7e8ca0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a092e2a4fdee19da23696d7271b375db6452bb1772a2bde5dfeb785c33b1c1a598884cf281b57f31301bf90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ee598a9b75bcce79297017b71641bdeaa58a6b82fc99f598b054b8144d91aebda07b05966e5c6b62f92af5ff3e2aaf188d93c24ec2a0a0e4e7f9434d1ffb7af186c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xee598a9b75bcce79297017b71641bdeaa58a6b82fc99f598b054b8144d91aebd",
+                        "s" : "0x7b05966e5c6b62f92af5ff3e2aaf188d93c24ec2a0a0e4e7f9434d1ffb7af186",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd09b0e497bfb3a9385277710d1b1058b1a2a4d251773ac3266c1e1743d83bb6d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g3v0.json
index 7a73a41bf..8077e67cf 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g3v0Filler.json",
+            "sourceHash" : "58940b20257abed35d980fdaaba63861c976bc79c884bf877285068540d6292b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0xf22ebecd7be2b6149d0f3fed1f306344d3c4d324a738c97ac95536748621ced4",
+                    "mixHash" : "0x0c4395df70ffe9bfb520766189c6e8adfccb56d13c2da13b10c63a4092308883",
+                    "nonce" : "0x6d99fa3da253b2c9",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x87295d263cb4afaec4f395cdd8b2481cfcaf86e89dc65a8320ca1cb42d864f60",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a087295d263cb4afaec4f395cdd8b2481cfcaf86e89dc65a8320ca1cb42d864f60a0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a00c4395df70ffe9bfb520766189c6e8adfccb56d13c2da13b10c63a4092308883886d99fa3da253b2c9f90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca04faa0819d25c04398cdd4c33163a124bca92b055ef7afd6ce46a361e57414fcba07f54dff2958620182cead0730b80582e7c4350c26020991df5414e56fcb0afa1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4faa0819d25c04398cdd4c33163a124bca92b055ef7afd6ce46a361e57414fcb",
+                        "s" : "0x7f54dff2958620182cead0730b80582e7c4350c26020991df5414e56fcb0afa1",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf22ebecd7be2b6149d0f3fed1f306344d3c4d324a738c97ac95536748621ced4",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0.json
index 870ccab54..dbadc77e3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_55190_55190_42965_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0Filler.json",
             "sourceHash" : "7611291d40ab13c47c2fdb440d494b377c8de26bb10d607293584433a2ae48b3"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xcf00",
-                    "hash" : "0x358df6b3702ad9402f4c572df325c87348d016cbc9949abdb90f8e01d8d7d63c",
-                    "mixHash" : "0x72290324450268a04190338340aae6db29771fb0c16197e36c18de33193d794a",
-                    "nonce" : "0xb4068fb44a2199f1",
+                    "hash" : "0x7c8390a1c067017041a0d40040f878b3068ee1a7f16944a664bba91cd7413514",
+                    "mixHash" : "0x5ad10658e90bfe27d6e660e8660c7674a837960515c11077441c0813dcfa1a0d",
+                    "nonce" : "0x171ae63c0abf7b45",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0xb2fe5e5176466f906e6f7ca0168b2d4ddb4acca8b16f632f44f4d6bc6c46e0e5",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xb628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01b22947964ad12c7051862521c42a066f618471525544b7d68eca94179031217a0b628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52a0b2fe5e5176466f906e6f7ca0168b2d4ddb4acca8b16f632f44f4d6bc6c46e0e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf008203e880a072290324450268a04190338340aae6db29771fb0c16197e36c18de33193d794a88b4068fb44a2199f1f90168f90165010182cf0094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca06a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9a077aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3cac0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01b22947964ad12c7051862521c42a066f618471525544b7d68eca94179031217a0b628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52a0b2fe5e5176466f906e6f7ca0168b2d4ddb4acca8b16f632f44f4d6bc6c46e0e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf008203e880a05ad10658e90bfe27d6e660e8660c7674a837960515c11077441c0813dcfa1a0d88171ae63c0abf7b45f90168f90165010182cf0094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca06a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9a077aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3cac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x358df6b3702ad9402f4c572df325c87348d016cbc9949abdb90f8e01d8d7d63c",
+        "lastblockhash" : "0x7c8390a1c067017041a0d40040f878b3068ee1a7f16944a664bba91cd7413514",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g1v0.json
index 7a73a41bf..a5c02797f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g1v0Filler.json",
+            "sourceHash" : "5ba5c9892f26ea949855e37148f9e9c32611231b6c2fdeaadd63efee1a1afb7b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0x0b0d57b0dbce75e3bdbb5b0529b72c90023cec762aea06ffa5e4d4d819725c7d",
+                    "mixHash" : "0xfcb17c8268b6a7f23e943dac1d0515f65fcd8017f1d99b0397648292f499798d",
+                    "nonce" : "0xb8023a87527bbb2f",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd87c9755af3d7d8d7a4f6b0bd33075093fa670d3eb013b9246b73cfbcb7ca7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0d87c9755af3d7d8d7a4f6b0bd33075093fa670d3eb013b9246b73cfbcb7ca7cea0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a0fcb17c8268b6a7f23e943dac1d0515f65fcd8017f1d99b0397648292f499798d88b8023a87527bbb2ff90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0398199221504e2121b759deb19ac369f7a67f4e7eb1f85fbc37d0c03be377670a0720a67f541ef0846692585d5f42be4777c7640021778ffeb134840a4d81b923ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x398199221504e2121b759deb19ac369f7a67f4e7eb1f85fbc37d0c03be377670",
+                        "s" : "0x720a67f541ef0846692585d5f42be4777c7640021778ffeb134840a4d81b923e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0b0d57b0dbce75e3bdbb5b0529b72c90023cec762aea06ffa5e4d4d819725c7d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g2v0.json
index 7a73a41bf..73342ed93 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g2v0Filler.json",
+            "sourceHash" : "509bf5bf3596ce8842257f53f43feeb341972d8dd67cad357609c40ebdb3f889"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0x257c58363b813fa8a24e516d22b311416f2439637dff9a917c5dcea437e74eb0",
+                    "mixHash" : "0x9c8cb029cf7a2d6ce36c1162f6f08eea9b022e7f10e1aeb70c58c1218e1b2f3c",
+                    "nonce" : "0xbdbe9cb9ef362c8e",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x591a9db175e93fc59fe2826d1b1526bf21f444a59c17ac484f44fcee7e3f7e8c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0591a9db175e93fc59fe2826d1b1526bf21f444a59c17ac484f44fcee7e3f7e8ca0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a09c8cb029cf7a2d6ce36c1162f6f08eea9b022e7f10e1aeb70c58c1218e1b2f3c88bdbe9cb9ef362c8ef90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ee598a9b75bcce79297017b71641bdeaa58a6b82fc99f598b054b8144d91aebda07b05966e5c6b62f92af5ff3e2aaf188d93c24ec2a0a0e4e7f9434d1ffb7af186c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xee598a9b75bcce79297017b71641bdeaa58a6b82fc99f598b054b8144d91aebd",
+                        "s" : "0x7b05966e5c6b62f92af5ff3e2aaf188d93c24ec2a0a0e4e7f9434d1ffb7af186",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x257c58363b813fa8a24e516d22b311416f2439637dff9a917c5dcea437e74eb0",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g3v0.json
index 7a73a41bf..22ec620aa 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g3v0Filler.json",
+            "sourceHash" : "c06c5b322df656fa7c69487fa28cb67aaaa955459bacff0131b719341b58e0ec"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0x48e24069d3e96e5623e9de342e6a5aec0033b39ac2c80d4078a3400739f30692",
+                    "mixHash" : "0xdc157b3f7218c697b365b43aba08829932619f90bde2dbe85125dca085d3d1f8",
+                    "nonce" : "0x061bb0ccebe2b5d5",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x87295d263cb4afaec4f395cdd8b2481cfcaf86e89dc65a8320ca1cb42d864f60",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a087295d263cb4afaec4f395cdd8b2481cfcaf86e89dc65a8320ca1cb42d864f60a0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a0dc157b3f7218c697b365b43aba08829932619f90bde2dbe85125dca085d3d1f888061bb0ccebe2b5d5f90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca04faa0819d25c04398cdd4c33163a124bca92b055ef7afd6ce46a361e57414fcba07f54dff2958620182cead0730b80582e7c4350c26020991df5414e56fcb0afa1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4faa0819d25c04398cdd4c33163a124bca92b055ef7afd6ce46a361e57414fcb",
+                        "s" : "0x7f54dff2958620182cead0730b80582e7c4350c26020991df5414e56fcb0afa1",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x48e24069d3e96e5623e9de342e6a5aec0033b39ac2c80d4078a3400739f30692",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0.json
index c624fb313..b26c6497b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_55190_55190_42965_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0Filler.json",
             "sourceHash" : "867a20066a600acff87eeb614393299d2561cdcbb2302a3f5cc2db71e45461be"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf577",
-                    "hash" : "0xbdd8048d79127484f7a1f193d1112b0ea23dd5609bea8febf1836cc135c49907",
-                    "mixHash" : "0x8fd63d47a0f1e23b78d0fd0dbb1784e5a4630922510af0eee69ee489df5a6d21",
-                    "nonce" : "0xc4317de0c5cb4071",
+                    "hash" : "0x14525057bfbab2d84cb3f770941853682c73d7987f8d6750cb46db028d633a29",
+                    "mixHash" : "0x6425aa3bfcc7fd11ccef1a3d0f5a3f38d0a6389e887c8e955c6576faba1c74fa",
+                    "nonce" : "0x9b6d31b81a726b90",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xf8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0f8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1ca0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a08fd63d47a0f1e23b78d0fd0dbb1784e5a4630922510af0eee69ee489df5a6d2188c4317de0c5cb4071f90168f90165010182f61094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca02fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562da07930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0f8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1ca0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a06425aa3bfcc7fd11ccef1a3d0f5a3f38d0a6389e887c8e955c6576faba1c74fa889b6d31b81a726b90f90168f90165010182f61094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca02fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562da07930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbdd8048d79127484f7a1f193d1112b0ea23dd5609bea8febf1836cc135c49907",
+        "lastblockhash" : "0x14525057bfbab2d84cb3f770941853682c73d7987f8d6750cb46db028d633a29",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g1v0.json
index 7a73a41bf..bc09a6ae4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g1v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g1v0Filler.json",
+            "sourceHash" : "d2ff793900f6e68831acaa55f6fe5c40fe6776e6a818f5dc620bd813e70c81d4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0xda7c87712ebae208ee15d70efec34e556450f3725f21e462d4bddfe6fc9366cb",
+                    "mixHash" : "0x48f39f5caf1e07a0807ae20b7f2912e2da4cd26f858c2c3b792eeb32c961313f",
+                    "nonce" : "0x293bff0457bdce28",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd87c9755af3d7d8d7a4f6b0bd33075093fa670d3eb013b9246b73cfbcb7ca7ce",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0d87c9755af3d7d8d7a4f6b0bd33075093fa670d3eb013b9246b73cfbcb7ca7cea0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a048f39f5caf1e07a0807ae20b7f2912e2da4cd26f858c2c3b792eeb32c961313f88293bff0457bdce28f90169f90166010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0398199221504e2121b759deb19ac369f7a67f4e7eb1f85fbc37d0c03be377670a0720a67f541ef0846692585d5f42be4777c7640021778ffeb134840a4d81b923ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x398199221504e2121b759deb19ac369f7a67f4e7eb1f85fbc37d0c03be377670",
+                        "s" : "0x720a67f541ef0846692585d5f42be4777c7640021778ffeb134840a4d81b923e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xda7c87712ebae208ee15d70efec34e556450f3725f21e462d4bddfe6fc9366cb",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g2v0.json
index 7a73a41bf..3c165b971 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g2v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g2v0Filler.json",
+            "sourceHash" : "016e3d3bb56b4e530f9705d46d989771dbd3b4f7769f68548419521da686bee4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0xa060edc7cd47c7b33794384d8166e079b88f3df776cf78007033e957e3745386",
+                    "mixHash" : "0x766bc99a74d05844798b1ad08e2d1339dc38e1ded278bbdeb696c48c5574b7e5",
+                    "nonce" : "0x9efbbcf0c690ca51",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x591a9db175e93fc59fe2826d1b1526bf21f444a59c17ac484f44fcee7e3f7e8c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a0591a9db175e93fc59fe2826d1b1526bf21f444a59c17ac484f44fcee7e3f7e8ca0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a0766bc99a74d05844798b1ad08e2d1339dc38e1ded278bbdeb696c48c5574b7e5889efbbcf0c690ca51f90169f9016601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ee598a9b75bcce79297017b71641bdeaa58a6b82fc99f598b054b8144d91aebda07b05966e5c6b62f92af5ff3e2aaf188d93c24ec2a0a0e4e7f9434d1ffb7af186c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xee598a9b75bcce79297017b71641bdeaa58a6b82fc99f598b054b8144d91aebd",
+                        "s" : "0x7b05966e5c6b62f92af5ff3e2aaf188d93c24ec2a0a0e4e7f9434d1ffb7af186",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa060edc7cd47c7b33794384d8166e079b88f3df776cf78007033e957e3745386",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g3v0.json
index 7a73a41bf..a37aecaf3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g3v0.json
@@ -1,2 +1,229 @@
 {
+    "modexp_55190_55190_42965_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g3v0Filler.json",
+            "sourceHash" : "17daffa4ab22b84633fe239c767c85070dd96d078fc6451e437632e00c663d53"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf577",
+                    "hash" : "0xae23dfa6998999228e626354e952cd26005387d5ed6cc311874da4c7935e2227",
+                    "mixHash" : "0x7123514b16f6d73defe82d56706f81a4c4b6f73122e9779f6c2e41e1719f626e",
+                    "nonce" : "0x0ff9b35ae03d0d5b",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xc9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160d",
+                    "stateRoot" : "0xed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x87295d263cb4afaec4f395cdd8b2481cfcaf86e89dc65a8320ca1cb42d864f60",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ed3960cbd40bc73e979c2338a6307d6329bb325d1d05134dd64c301cd1556eb4a087295d263cb4afaec4f395cdd8b2481cfcaf86e89dc65a8320ca1cb42d864f60a0c9e8c6fc103ccb6ea60727236b949ccd89483688a5b252356683885372b2160db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f5778203e880a07123514b16f6d73defe82d56706f81a4c4b6f73122e9779f6c2e41e1719f626e880ff9b35ae03d0d5bf90169f90166010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca04faa0819d25c04398cdd4c33163a124bca92b055ef7afd6ce46a361e57414fcba07f54dff2958620182cead0730b80582e7c4350c26020991df5414e56fcb0afa1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4faa0819d25c04398cdd4c33163a124bca92b055ef7afd6ce46a361e57414fcb",
+                        "s" : "0x7f54dff2958620182cead0730b80582e7c4350c26020991df5414e56fcb0afa1",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xae23dfa6998999228e626354e952cd26005387d5ed6cc311874da4c7935e2227",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "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" : {
+                "balance" : "0x0de0b6b3a761089b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0.json
index 39d8f54fa..ea67e9611 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_9_37111_37111_1000000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0Filler.json",
             "sourceHash" : "8be041749c5815e5d9bd9875ce415e739559313f5108f41b6f853696dd4bcb99"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0b557c",
-                    "hash" : "0x0073a7fefa9ff57ce0db38a05ca67db64994485d70f078e0c59827f94d1a25dc",
-                    "mixHash" : "0xd9eb22b21f79d2288b0f5fa35149059426065df5cada7d98eafd81f293090f45",
-                    "nonce" : "0x9cb37b7c6f9beead",
+                    "hash" : "0xf198070d135386df25e1449cfc896f0db384a612e5803db3f4f9a22ddba52570",
+                    "mixHash" : "0x3c9f7cd5b40a8bd6e36da9dc3d5d6f6605a277797a6aa95f7c752028c165b102",
+                    "nonce" : "0x772b8976226aac23",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0x1ef3ddc2d46bc4095619e417c5d561c25f8dd25eafe5d3a5c548302615a26829",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fdf26b539822fbc81d0ab502a69a01a42383d81c7d22045d6efdc94678ab0021a0067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3da01ef3ddc2d46bc4095619e417c5d561c25f8dd25eafe5d3a5c548302615a26829b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830b557c8203e880a0d9eb22b21f79d2288b0f5fa35149059426065df5cada7d98eafd81f293090f45889cb37b7c6f9beeadf90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba079b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cfa01e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402c0",
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fdf26b539822fbc81d0ab502a69a01a42383d81c7d22045d6efdc94678ab0021a0067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3da01ef3ddc2d46bc4095619e417c5d561c25f8dd25eafe5d3a5c548302615a26829b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830b557c8203e880a03c9f7cd5b40a8bd6e36da9dc3d5d6f6605a277797a6aa95f7c752028c165b10288772b8976226aac23f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba079b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cfa01e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0073a7fefa9ff57ce0db38a05ca67db64994485d70f078e0c59827f94d1a25dc",
+        "lastblockhash" : "0xf198070d135386df25e1449cfc896f0db384a612e5803db3f4f9a22ddba52570",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g1v0.json
index 7a73a41bf..330873b0a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_1000000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g1v0Filler.json",
+            "sourceHash" : "9eb36086ab2bec569243bce66025204755f9a5e86350e383054214bbcfcb4f7f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0xe072a791004cf47539980d927bb0bb581ba59ec6f6a47821407340480e6c5087",
+                    "mixHash" : "0xb8f23fe8cd11f947eaa1940dbcd462260719ab99aa2933dfcd0a7e13fc670e64",
+                    "nonce" : "0xfc526bf1760715a6",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xa020341b9a9d93e6e5757b269e2ac36ee065e1a9d3cdc9e6b51ceb55efe36a3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9b550325f1ed5a41ec7742f224f009c05adb714b8e89af8796cd029d4e0d0c69",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a020341b9a9d93e6e5757b269e2ac36ee065e1a9d3cdc9e6b51ceb55efe36a3fa09b550325f1ed5a41ec7742f224f009c05adb714b8e89af8796cd029d4e0d0c69a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0b8f23fe8cd11f947eaa1940dbcd462260719ab99aa2933dfcd0a7e13fc670e6488fc526bf1760715a6f90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba06dd685e4783302373aaa38753e16c3ee9fecf359f4c7af1c1ce5aca1093a6f4fa058ae4fd09eeb369e772b3b5f3a905a719d3c7a657ec587b15228ac2c8467f7d5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x6dd685e4783302373aaa38753e16c3ee9fecf359f4c7af1c1ce5aca1093a6f4f",
+                        "s" : "0x58ae4fd09eeb369e772b3b5f3a905a719d3c7a657ec587b15228ac2c8467f7d5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe072a791004cf47539980d927bb0bb581ba59ec6f6a47821407340480e6c5087",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g2v0.json
index 7a73a41bf..7974cc1a9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_1000000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g2v0Filler.json",
+            "sourceHash" : "773c7d1a706e42e3958e161c8511156e61be8b31db593387655c5dc0d22ad9e8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x5249dda2a76fa5fed67df22a568399aa2a019bb0e4ff3075bd18f1725356e9f9",
+                    "mixHash" : "0x9e746a01fbc64da2d5c9b2986936c7724f247dde7416d7fdc1735eeea7c4dd35",
+                    "nonce" : "0xdba9b4e91ef4229c",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x60b271b6516e4f49425fb4ac56bb7f97761d7bdf9786bcffdcce0dee3be30a30",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x18affa0a0509422e699662d66a334e6ca8411f20c8c4eb149a3cb5fa637418ad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a060b271b6516e4f49425fb4ac56bb7f97761d7bdf9786bcffdcce0dee3be30a30a018affa0a0509422e699662d66a334e6ca8411f20c8c4eb149a3cb5fa637418ada0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a09e746a01fbc64da2d5c9b2986936c7724f247dde7416d7fdc1735eeea7c4dd3588dba9b4e91ef4229cf90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba0647dd7d94872cea21579ebd055a3f92206617ab52baac6bc3d9dbd6a46bfe4bea02ac8d4e15f02fa0f951e3c8903ecb0d0bf50aae4abcede9a45d8b703d300211cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x647dd7d94872cea21579ebd055a3f92206617ab52baac6bc3d9dbd6a46bfe4be",
+                        "s" : "0x2ac8d4e15f02fa0f951e3c8903ecb0d0bf50aae4abcede9a45d8b703d300211c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5249dda2a76fa5fed67df22a568399aa2a019bb0e4ff3075bd18f1725356e9f9",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g3v0.json
index 7a73a41bf..139f68614 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_1000000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g3v0Filler.json",
+            "sourceHash" : "a5e5433e6f2c564f86341f65f3016b917d9a56f6b4dc91e19ae5d7fb949d7da1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x6d518683ad637156fb8acef5a637b715d6817e65c8c51e0cbd01d05462b33c61",
+                    "mixHash" : "0xf4481305013a655cdc4ec33b7811c1fab0df17d41db074589bb05b5a66fb6307",
+                    "nonce" : "0x8be5b93f1b557ce6",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x29c92115e67eec179ba0279b9e30f701c874df4651f8175038774f782cfa75d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe4874a719d6d52a0963a196963986a92d4c07a9d03fcb233e5753aa068cfd0da",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a029c92115e67eec179ba0279b9e30f701c874df4651f8175038774f782cfa75d6a0e4874a719d6d52a0963a196963986a92d4c07a9d03fcb233e5753aa068cfd0daa0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0f4481305013a655cdc4ec33b7811c1fab0df17d41db074589bb05b5a66fb6307888be5b93f1b557ce6f90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0cf0bf07c06e34b4bd3d3ae7272567f467dfb13b4b5ca6a3b59ca8f8eefcf5552a06bad042b7c089dddf86904e30159c0da2c550db275175f6f5b3cad787f3f779ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xcf0bf07c06e34b4bd3d3ae7272567f467dfb13b4b5ca6a3b59ca8f8eefcf5552",
+                        "s" : "0x6bad042b7c089dddf86904e30159c0da2c550db275175f6f5b3cad787f3f779e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6d518683ad637156fb8acef5a637b715d6817e65c8c51e0cbd01d05462b33c61",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0.json
index bea797264..bb9a00dfb 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_9_37111_37111_155000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0Filler.json",
-            "sourceHash" : "ada38dc6b669c8d0192d11282017a55df314e1891461c0151362f4af46ded5e8"
+            "sourceHash" : "8c9066bc8a9952434e8f18facfb3f5df664b64c5ef2f274555911cb1fc4c1fed"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02f950",
-                    "hash" : "0x40ee208d4120a7bca0c484d82958ec453fd1ae60507285ad39b8f0cbce182948",
-                    "mixHash" : "0x20f87bac8f233f6b29e0d6061ee47720abcbc5a2742f1a9db051adc7a9d3ef58",
-                    "nonce" : "0x237e6734e5c3ea01",
+                    "hash" : "0x77cadaace613a1691ae64e150e1956ede5d2236d0ef12a50f86dff828cb9140d",
+                    "mixHash" : "0x66c1cebe011b2d9053bc226b8ca635ceb459253a3d0913c5ffa7e6f3be5026f7",
+                    "nonce" : "0x98b3b118b45fdd6e",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0x39569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a026e413d94b1291654a0cca3b5ab7159a280adf17ea8b267890c64740ebd7d9f3a0774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48a039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a020f87bac8f233f6b29e0d6061ee47720abcbc5a2742f1a9db051adc7a9d3ef5888237e6734e5c3ea01f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabba070c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6c0",
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a026e413d94b1291654a0cca3b5ab7159a280adf17ea8b267890c64740ebd7d9f3a0774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48a039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a066c1cebe011b2d9053bc226b8ca635ceb459253a3d0913c5ffa7e6f3be5026f78898b3b118b45fdd6ef90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabba070c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x40ee208d4120a7bca0c484d82958ec453fd1ae60507285ad39b8f0cbce182948",
+        "lastblockhash" : "0x77cadaace613a1691ae64e150e1956ede5d2236d0ef12a50f86dff828cb9140d",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g1v0.json
index 7a73a41bf..f0b842f0d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_155000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g1v0Filler.json",
+            "sourceHash" : "835c84ec771c8985ff82b4bfb1d6df7747ac65ee1ca0a67c1b1a9c55e35253c5"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x1a86cab8c91356a669c9cb11ee6979731bc9aad7ae85b36aac4af3341ef8802d",
+                    "mixHash" : "0x87ae1fe292daf0acbbe89a1bd0205dddf766cba76c7e2fa0d0f13405fabffe74",
+                    "nonce" : "0x9bd7a2ad46925f68",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xa020341b9a9d93e6e5757b269e2ac36ee065e1a9d3cdc9e6b51ceb55efe36a3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9b550325f1ed5a41ec7742f224f009c05adb714b8e89af8796cd029d4e0d0c69",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a020341b9a9d93e6e5757b269e2ac36ee065e1a9d3cdc9e6b51ceb55efe36a3fa09b550325f1ed5a41ec7742f224f009c05adb714b8e89af8796cd029d4e0d0c69a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a087ae1fe292daf0acbbe89a1bd0205dddf766cba76c7e2fa0d0f13405fabffe74889bd7a2ad46925f68f90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba06dd685e4783302373aaa38753e16c3ee9fecf359f4c7af1c1ce5aca1093a6f4fa058ae4fd09eeb369e772b3b5f3a905a719d3c7a657ec587b15228ac2c8467f7d5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x6dd685e4783302373aaa38753e16c3ee9fecf359f4c7af1c1ce5aca1093a6f4f",
+                        "s" : "0x58ae4fd09eeb369e772b3b5f3a905a719d3c7a657ec587b15228ac2c8467f7d5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1a86cab8c91356a669c9cb11ee6979731bc9aad7ae85b36aac4af3341ef8802d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g2v0.json
index 7a73a41bf..7b0afb9e6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_155000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g2v0Filler.json",
+            "sourceHash" : "5046e19bf5564dae42825dff9a3c48e7f010f6a450198533d38b3befecfe4b03"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x9f3185b701581980f6caddbeae45bcfa71337e449911ddf54fa16976ccd2c931",
+                    "mixHash" : "0x4586e1f4ad9c049a3fbf21a32d9c6464cd5fc173aca04feb347db838ec7b6207",
+                    "nonce" : "0x7074c41b671ed005",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x60b271b6516e4f49425fb4ac56bb7f97761d7bdf9786bcffdcce0dee3be30a30",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x18affa0a0509422e699662d66a334e6ca8411f20c8c4eb149a3cb5fa637418ad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a060b271b6516e4f49425fb4ac56bb7f97761d7bdf9786bcffdcce0dee3be30a30a018affa0a0509422e699662d66a334e6ca8411f20c8c4eb149a3cb5fa637418ada0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a04586e1f4ad9c049a3fbf21a32d9c6464cd5fc173aca04feb347db838ec7b6207887074c41b671ed005f90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba0647dd7d94872cea21579ebd055a3f92206617ab52baac6bc3d9dbd6a46bfe4bea02ac8d4e15f02fa0f951e3c8903ecb0d0bf50aae4abcede9a45d8b703d300211cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x647dd7d94872cea21579ebd055a3f92206617ab52baac6bc3d9dbd6a46bfe4be",
+                        "s" : "0x2ac8d4e15f02fa0f951e3c8903ecb0d0bf50aae4abcede9a45d8b703d300211c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9f3185b701581980f6caddbeae45bcfa71337e449911ddf54fa16976ccd2c931",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g3v0.json
index 7a73a41bf..6a54d2938 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_155000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g3v0Filler.json",
+            "sourceHash" : "0aa821e70dac9387ab5ac17df33f0afbb9e45ef6c5d10bc34f886b6516642218"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xf7a95328b03e3fd71abadebb2d61035a897f5078f2512953f224e8c5e756111d",
+                    "mixHash" : "0x004ea826b16442f3fc178a483cd2647390abbc546d02d563d3120566f82cbb40",
+                    "nonce" : "0xd4f5044cda739d84",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x29c92115e67eec179ba0279b9e30f701c874df4651f8175038774f782cfa75d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe4874a719d6d52a0963a196963986a92d4c07a9d03fcb233e5753aa068cfd0da",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a029c92115e67eec179ba0279b9e30f701c874df4651f8175038774f782cfa75d6a0e4874a719d6d52a0963a196963986a92d4c07a9d03fcb233e5753aa068cfd0daa0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0004ea826b16442f3fc178a483cd2647390abbc546d02d563d3120566f82cbb4088d4f5044cda739d84f90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0cf0bf07c06e34b4bd3d3ae7272567f467dfb13b4b5ca6a3b59ca8f8eefcf5552a06bad042b7c089dddf86904e30159c0da2c550db275175f6f5b3cad787f3f779ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xcf0bf07c06e34b4bd3d3ae7272567f467dfb13b4b5ca6a3b59ca8f8eefcf5552",
+                        "s" : "0x6bad042b7c089dddf86904e30159c0da2c550db275175f6f5b3cad787f3f779e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf7a95328b03e3fd71abadebb2d61035a897f5078f2512953f224e8c5e756111d",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0.json
index 94e874ab6..9ff7bd9e1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_9_37111_37111_20500_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0Filler.json",
-            "sourceHash" : "b93b6cfd492778a41a2063c610d320c6166c0e38d5fe926c0efe7df22df98cf6"
+            "sourceHash" : "1f7d4b10ad2a20659ad48e255832f396984bdcb73c507b1392bb09df53024183"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0x02f5549351d48a7c767a75b74d403b24fb6c3b3d30b907405aa15d9e91fc90a3",
-                    "mixHash" : "0x17c3ee29981648c8193088d651da4a6df0e22fd87fc5296167d73a21acd437a0",
-                    "nonce" : "0xf95a5832a8c401be",
+                    "hash" : "0x559c592267351f86451467e2306bd5e186d987a3ac0c6acb1a70059779a8760b",
+                    "mixHash" : "0x006ae0dfb0af7ea7c6df4a57c17897add4ed90a219bb3774d4760bea693cdd84",
+                    "nonce" : "0xef86434fd689ab2f",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0xc9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x6dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02e98907b907d0aab56141186e1793430f1fc98e6b69c868759f9a05c67b190cea06dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38a0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a017c3ee29981648c8193088d651da4a6df0e22fd87fc5296167d73a21acd437a088f95a5832a8c401bef90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0da2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168a04a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625ec0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02e98907b907d0aab56141186e1793430f1fc98e6b69c868759f9a05c67b190cea06dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38a0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0006ae0dfb0af7ea7c6df4a57c17897add4ed90a219bb3774d4760bea693cdd8488ef86434fd689ab2ff90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0da2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168a04a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02f5549351d48a7c767a75b74d403b24fb6c3b3d30b907405aa15d9e91fc90a3",
+        "lastblockhash" : "0x559c592267351f86451467e2306bd5e186d987a3ac0c6acb1a70059779a8760b",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g1v0.json
index 7a73a41bf..e2686e2de 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_20500_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g1v0Filler.json",
+            "sourceHash" : "afae37b48a1b48fd96428c1b5c32846485e89bf0b1d7431bab00a9fdc9d946fb"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x4be95ff7402ee3ecd27fcaa4b951edcbb11ea5bcdf0f4ab568dea10228d48a52",
+                    "mixHash" : "0x33384b299941662e6e7bd250b80d2ee3967b56b8f56cfb0c43b8117004fb517c",
+                    "nonce" : "0x6b6ce4e52a929a03",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xa020341b9a9d93e6e5757b269e2ac36ee065e1a9d3cdc9e6b51ceb55efe36a3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9b550325f1ed5a41ec7742f224f009c05adb714b8e89af8796cd029d4e0d0c69",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a020341b9a9d93e6e5757b269e2ac36ee065e1a9d3cdc9e6b51ceb55efe36a3fa09b550325f1ed5a41ec7742f224f009c05adb714b8e89af8796cd029d4e0d0c69a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a033384b299941662e6e7bd250b80d2ee3967b56b8f56cfb0c43b8117004fb517c886b6ce4e52a929a03f90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba06dd685e4783302373aaa38753e16c3ee9fecf359f4c7af1c1ce5aca1093a6f4fa058ae4fd09eeb369e772b3b5f3a905a719d3c7a657ec587b15228ac2c8467f7d5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x6dd685e4783302373aaa38753e16c3ee9fecf359f4c7af1c1ce5aca1093a6f4f",
+                        "s" : "0x58ae4fd09eeb369e772b3b5f3a905a719d3c7a657ec587b15228ac2c8467f7d5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4be95ff7402ee3ecd27fcaa4b951edcbb11ea5bcdf0f4ab568dea10228d48a52",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g2v0.json
index 7a73a41bf..8b73e1a0f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_20500_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g2v0Filler.json",
+            "sourceHash" : "8625598773990949b0dfa2939dd6419074ace7c5bd817113e3a61a261ccf1840"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x682fc0a257a0d15c4da93365c8084d1481a8f5ec343930c2e2e57af3f4d99997",
+                    "mixHash" : "0x79d2fe5029e5f2ca9ad4b107214bae7cae316324d03d56f74b2774fa0ead6b37",
+                    "nonce" : "0x288e0b1a873a6f1d",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x60b271b6516e4f49425fb4ac56bb7f97761d7bdf9786bcffdcce0dee3be30a30",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x18affa0a0509422e699662d66a334e6ca8411f20c8c4eb149a3cb5fa637418ad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a060b271b6516e4f49425fb4ac56bb7f97761d7bdf9786bcffdcce0dee3be30a30a018affa0a0509422e699662d66a334e6ca8411f20c8c4eb149a3cb5fa637418ada0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a079d2fe5029e5f2ca9ad4b107214bae7cae316324d03d56f74b2774fa0ead6b3788288e0b1a873a6f1df90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba0647dd7d94872cea21579ebd055a3f92206617ab52baac6bc3d9dbd6a46bfe4bea02ac8d4e15f02fa0f951e3c8903ecb0d0bf50aae4abcede9a45d8b703d300211cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x647dd7d94872cea21579ebd055a3f92206617ab52baac6bc3d9dbd6a46bfe4be",
+                        "s" : "0x2ac8d4e15f02fa0f951e3c8903ecb0d0bf50aae4abcede9a45d8b703d300211c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x682fc0a257a0d15c4da93365c8084d1481a8f5ec343930c2e2e57af3f4d99997",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g3v0.json
index 7a73a41bf..61bec0b0d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_20500_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g3v0Filler.json",
+            "sourceHash" : "48af105c92fdc42d8be45fc8fec102434dde60cda2be17b27c96aa389ea51a8f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x315f93e1c2924483ef7a005b5d0fa5500c90e837d434c003fdca3434afbfda4b",
+                    "mixHash" : "0xa024b3c898d493ae4604b3ffb0de1ebd783d9229d792c1fe9f2b91ca52501bac",
+                    "nonce" : "0x453de04213033c6c",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x29c92115e67eec179ba0279b9e30f701c874df4651f8175038774f782cfa75d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe4874a719d6d52a0963a196963986a92d4c07a9d03fcb233e5753aa068cfd0da",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a029c92115e67eec179ba0279b9e30f701c874df4651f8175038774f782cfa75d6a0e4874a719d6d52a0963a196963986a92d4c07a9d03fcb233e5753aa068cfd0daa0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0a024b3c898d493ae4604b3ffb0de1ebd783d9229d792c1fe9f2b91ca52501bac88453de04213033c6cf90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0cf0bf07c06e34b4bd3d3ae7272567f467dfb13b4b5ca6a3b59ca8f8eefcf5552a06bad042b7c089dddf86904e30159c0da2c550db275175f6f5b3cad787f3f779ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xcf0bf07c06e34b4bd3d3ae7272567f467dfb13b4b5ca6a3b59ca8f8eefcf5552",
+                        "s" : "0x6bad042b7c089dddf86904e30159c0da2c550db275175f6f5b3cad787f3f779e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x315f93e1c2924483ef7a005b5d0fa5500c90e837d434c003fdca3434afbfda4b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0.json
index c747bd441..38ec16c6c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_9_37111_37111_22000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0Filler.json",
-            "sourceHash" : "92c367ef8d904f6cdf71689e9717bb806d638a7967ec7e5a258aa4c695ca43cc"
+            "sourceHash" : "2dacafa2d887b19e25d36efcb772136636e5b302cdfc1b76822d9e0a281bd6e6"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1c8",
-                    "hash" : "0xa401e3f0bb88cb3e3bb04d2a362794e766aa5b23ecc9c589b3176f6ba852a483",
-                    "mixHash" : "0x50fd45a59c9fca6d6c8d6c639b38e9e459bd90ad091b594a26d2169483dad8b3",
-                    "nonce" : "0x79fd4094d9c61bb0",
+                    "hash" : "0xd0298de1022aabc0423ec61b1e691b2105cb0bbf9c251a01648565b69c0c0251",
+                    "mixHash" : "0xe286a0722b484a9ce326bab5246942a9690b041e0bf7e097efb592203fbdbf9c",
+                    "nonce" : "0x058c899a4560db8a",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0x026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601ed",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xa7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a076c99bf8e48fdb2b31192656c346479d94fecd352a94aeac2668f187f6b07d31a0a7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60a0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a050fd45a59c9fca6d6c8d6c639b38e9e459bd90ad091b594a26d2169483dad8b38879fd4094d9c61bb0f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba05cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229a05a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7bc0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a076c99bf8e48fdb2b31192656c346479d94fecd352a94aeac2668f187f6b07d31a0a7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60a0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a0e286a0722b484a9ce326bab5246942a9690b041e0bf7e097efb592203fbdbf9c88058c899a4560db8af90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba05cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229a05a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa401e3f0bb88cb3e3bb04d2a362794e766aa5b23ecc9c589b3176f6ba852a483",
+        "lastblockhash" : "0xd0298de1022aabc0423ec61b1e691b2105cb0bbf9c251a01648565b69c0c0251",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g1v0.json
index 7a73a41bf..792d93100 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_22000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g1v0Filler.json",
+            "sourceHash" : "51ecabf064254e4a7814ae127e8eb942d05dbb55aae373230cc25533a1a3af79"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x3c8d9549e6ee5018ec022ff3bc912a3eab1da44ff2c35aefd0249bb7334b32de",
+                    "mixHash" : "0x52b4ab6414c0e835cd94b193f62f2d3f317d77061c650e70906b9d9b2fc3209e",
+                    "nonce" : "0x526d006aa28f1e15",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xa020341b9a9d93e6e5757b269e2ac36ee065e1a9d3cdc9e6b51ceb55efe36a3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9b550325f1ed5a41ec7742f224f009c05adb714b8e89af8796cd029d4e0d0c69",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a020341b9a9d93e6e5757b269e2ac36ee065e1a9d3cdc9e6b51ceb55efe36a3fa09b550325f1ed5a41ec7742f224f009c05adb714b8e89af8796cd029d4e0d0c69a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a052b4ab6414c0e835cd94b193f62f2d3f317d77061c650e70906b9d9b2fc3209e88526d006aa28f1e15f90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba06dd685e4783302373aaa38753e16c3ee9fecf359f4c7af1c1ce5aca1093a6f4fa058ae4fd09eeb369e772b3b5f3a905a719d3c7a657ec587b15228ac2c8467f7d5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x6dd685e4783302373aaa38753e16c3ee9fecf359f4c7af1c1ce5aca1093a6f4f",
+                        "s" : "0x58ae4fd09eeb369e772b3b5f3a905a719d3c7a657ec587b15228ac2c8467f7d5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3c8d9549e6ee5018ec022ff3bc912a3eab1da44ff2c35aefd0249bb7334b32de",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g2v0.json
index 7a73a41bf..9f25cc735 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_22000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g2v0Filler.json",
+            "sourceHash" : "8dcb95f37d6b969bd0b252d410049c017492b9e6e2c3c0deaf0a3fadfcaca961"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x831a907b2b9d76e37b55c8bac399767d8f9e82fcf00f9c1b4ff8b80982a5c88b",
+                    "mixHash" : "0xa39f9c13359670733c5bccfe22492f81f28af6b47b5f2e488a85411f62e93a60",
+                    "nonce" : "0x38eb163933ec14cf",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x60b271b6516e4f49425fb4ac56bb7f97761d7bdf9786bcffdcce0dee3be30a30",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x18affa0a0509422e699662d66a334e6ca8411f20c8c4eb149a3cb5fa637418ad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a060b271b6516e4f49425fb4ac56bb7f97761d7bdf9786bcffdcce0dee3be30a30a018affa0a0509422e699662d66a334e6ca8411f20c8c4eb149a3cb5fa637418ada0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a0a39f9c13359670733c5bccfe22492f81f28af6b47b5f2e488a85411f62e93a608838eb163933ec14cff90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba0647dd7d94872cea21579ebd055a3f92206617ab52baac6bc3d9dbd6a46bfe4bea02ac8d4e15f02fa0f951e3c8903ecb0d0bf50aae4abcede9a45d8b703d300211cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x647dd7d94872cea21579ebd055a3f92206617ab52baac6bc3d9dbd6a46bfe4be",
+                        "s" : "0x2ac8d4e15f02fa0f951e3c8903ecb0d0bf50aae4abcede9a45d8b703d300211c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x831a907b2b9d76e37b55c8bac399767d8f9e82fcf00f9c1b4ff8b80982a5c88b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g3v0.json
index 7a73a41bf..a38ddd9c1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_22000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g3v0Filler.json",
+            "sourceHash" : "b2df46d03fc8cdf526f21721013fcd86ad9394c3a56cba68304b9e2d875b40b1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xdb203f3fa40252e63781b11b24a9ceaceaa7a036db83055a5240c20d7777dea4",
+                    "mixHash" : "0x4a227c08ae2a01a12125f7932ec35d576570810bb6a97c8412a7574d6badfd1a",
+                    "nonce" : "0xac60258d139ac29c",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x29c92115e67eec179ba0279b9e30f701c874df4651f8175038774f782cfa75d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe4874a719d6d52a0963a196963986a92d4c07a9d03fcb233e5753aa068cfd0da",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a029c92115e67eec179ba0279b9e30f701c874df4651f8175038774f782cfa75d6a0e4874a719d6d52a0963a196963986a92d4c07a9d03fcb233e5753aa068cfd0daa0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a04a227c08ae2a01a12125f7932ec35d576570810bb6a97c8412a7574d6badfd1a88ac60258d139ac29cf90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0cf0bf07c06e34b4bd3d3ae7272567f467dfb13b4b5ca6a3b59ca8f8eefcf5552a06bad042b7c089dddf86904e30159c0da2c550db275175f6f5b3cad787f3f779ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xcf0bf07c06e34b4bd3d3ae7272567f467dfb13b4b5ca6a3b59ca8f8eefcf5552",
+                        "s" : "0x6bad042b7c089dddf86904e30159c0da2c550db275175f6f5b3cad787f3f779e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdb203f3fa40252e63781b11b24a9ceaceaa7a036db83055a5240c20d7777dea4",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0.json
index a19381596..bb2e8a18d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_9_37111_37111_35000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0Filler.json",
-            "sourceHash" : "4364d4bab3605000a49342e8bf31a022316603a9c3b108bb1c359da67822edd6"
+            "sourceHash" : "8156ff081189a172d394178c9e63dc47cbfd94b46bb365c92d670306ad49a9c9"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x012490",
-                    "hash" : "0xc2c44ce63f91555edc7287151affd874390157e7cb92c9cb69d132b0ed15bb7c",
-                    "mixHash" : "0x68f1f180d226c0f413764924670ed60a6e91075fffa747c9ee6daa70ac4262af",
-                    "nonce" : "0x15bf943c74d9f85f",
+                    "hash" : "0x39502803d624779a2f72f81aac9da8f779f0efd1ecd110abfecc5e5ff6f56c82",
+                    "mixHash" : "0x083430d271f482bf36270d8ce0be899842d4bead29300b55bd7e966d3737c1a5",
+                    "nonce" : "0x607a2f4996b52715",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0xf1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xf8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bf737f6f401e9afc87b7f820019c775ee0f7ace09e66df078c35807ddc1879d7a0f8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881fa0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a068f1f180d226c0f413764924670ed60a6e91075fffa747c9ee6daa70ac4262af8815bf943c74d9f85ff90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba00b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60a0512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916ec0",
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bf737f6f401e9afc87b7f820019c775ee0f7ace09e66df078c35807ddc1879d7a0f8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881fa0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0083430d271f482bf36270d8ce0be899842d4bead29300b55bd7e966d3737c1a588607a2f4996b52715f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba00b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60a0512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc2c44ce63f91555edc7287151affd874390157e7cb92c9cb69d132b0ed15bb7c",
+        "lastblockhash" : "0x39502803d624779a2f72f81aac9da8f779f0efd1ecd110abfecc5e5ff6f56c82",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g1v0.json
index 7a73a41bf..b0dd32e03 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_35000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g1v0Filler.json",
+            "sourceHash" : "13d4377e596816294713ab000d9c76ddbf9617cfb40d17e7a0a3670c983a3c34"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x60a5b6fa2477a13f04b4105b48e97415bd6189cf8e6f94951f379f307a86377c",
+                    "mixHash" : "0xcd1e87668f660176bb785edc88dcea8ca3382bd9b36160064795fe21f150c8ae",
+                    "nonce" : "0xd842f5afd74686d2",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xa020341b9a9d93e6e5757b269e2ac36ee065e1a9d3cdc9e6b51ceb55efe36a3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9b550325f1ed5a41ec7742f224f009c05adb714b8e89af8796cd029d4e0d0c69",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a020341b9a9d93e6e5757b269e2ac36ee065e1a9d3cdc9e6b51ceb55efe36a3fa09b550325f1ed5a41ec7742f224f009c05adb714b8e89af8796cd029d4e0d0c69a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0cd1e87668f660176bb785edc88dcea8ca3382bd9b36160064795fe21f150c8ae88d842f5afd74686d2f90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba06dd685e4783302373aaa38753e16c3ee9fecf359f4c7af1c1ce5aca1093a6f4fa058ae4fd09eeb369e772b3b5f3a905a719d3c7a657ec587b15228ac2c8467f7d5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x6dd685e4783302373aaa38753e16c3ee9fecf359f4c7af1c1ce5aca1093a6f4f",
+                        "s" : "0x58ae4fd09eeb369e772b3b5f3a905a719d3c7a657ec587b15228ac2c8467f7d5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x60a5b6fa2477a13f04b4105b48e97415bd6189cf8e6f94951f379f307a86377c",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g2v0.json
index 7a73a41bf..516db7f84 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_35000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g2v0Filler.json",
+            "sourceHash" : "add41cd03aaa958964fa25371a17b58eda18fa2472604bc695755d27c77e647c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x4c951ff64e356fe6926622cbf85b112bcc9328791958d5e4ea0a40740b257640",
+                    "mixHash" : "0xb84b3fb609ba8cef7a943d784d12be3f2e5e1aa778bb23715704bfb8640e9737",
+                    "nonce" : "0x326f0411d3300f64",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x60b271b6516e4f49425fb4ac56bb7f97761d7bdf9786bcffdcce0dee3be30a30",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x18affa0a0509422e699662d66a334e6ca8411f20c8c4eb149a3cb5fa637418ad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a060b271b6516e4f49425fb4ac56bb7f97761d7bdf9786bcffdcce0dee3be30a30a018affa0a0509422e699662d66a334e6ca8411f20c8c4eb149a3cb5fa637418ada0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a0b84b3fb609ba8cef7a943d784d12be3f2e5e1aa778bb23715704bfb8640e973788326f0411d3300f64f90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba0647dd7d94872cea21579ebd055a3f92206617ab52baac6bc3d9dbd6a46bfe4bea02ac8d4e15f02fa0f951e3c8903ecb0d0bf50aae4abcede9a45d8b703d300211cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x647dd7d94872cea21579ebd055a3f92206617ab52baac6bc3d9dbd6a46bfe4be",
+                        "s" : "0x2ac8d4e15f02fa0f951e3c8903ecb0d0bf50aae4abcede9a45d8b703d300211c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4c951ff64e356fe6926622cbf85b112bcc9328791958d5e4ea0a40740b257640",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g3v0.json
index 7a73a41bf..5c0bebbd3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_37111_37111_35000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g3v0Filler.json",
+            "sourceHash" : "25f88dbd16139e65603c1737b4598ac9593c2f7951e313681e80c813e521636c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xcbe63553f4d4fd369a532a65bbe9385ecffbff78f84ffd43a57d3cd64a9684f7",
+                    "mixHash" : "0x9af596138ea16d9a808750320003475ddc23df54e8590746daef316acb276ea5",
+                    "nonce" : "0x1eceb029f013f7a4",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x29c92115e67eec179ba0279b9e30f701c874df4651f8175038774f782cfa75d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe4874a719d6d52a0963a196963986a92d4c07a9d03fcb233e5753aa068cfd0da",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a029c92115e67eec179ba0279b9e30f701c874df4651f8175038774f782cfa75d6a0e4874a719d6d52a0963a196963986a92d4c07a9d03fcb233e5753aa068cfd0daa0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a09af596138ea16d9a808750320003475ddc23df54e8590746daef316acb276ea5881eceb029f013f7a4f90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0cf0bf07c06e34b4bd3d3ae7272567f467dfb13b4b5ca6a3b59ca8f8eefcf5552a06bad042b7c089dddf86904e30159c0da2c550db275175f6f5b3cad787f3f779ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xcf0bf07c06e34b4bd3d3ae7272567f467dfb13b4b5ca6a3b59ca8f8eefcf5552",
+                        "s" : "0x6bad042b7c089dddf86904e30159c0da2c550db275175f6f5b3cad787f3f779e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcbe63553f4d4fd369a532a65bbe9385ecffbff78f84ffd43a57d3cd64a9684f7",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0.json
index c08ba0447..097ca6228 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0.json
@@ -2,10 +2,10 @@
     "modexp_9_3711_37111_25000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0Filler.json",
-            "sourceHash" : "c9bfede06fc76043e808e41da093c4a7b9773e9260ff93252b3f3468a44eb769"
+            "sourceHash" : "ee37e6a369b1fc4cce35d67d2103aa30c10ab19cf88965caa0dd0ee1062fb368"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xfd80",
-                    "hash" : "0xdcee10fc476159f5514385458bed22bd32ecd94b0108848556962a51c45631c6",
-                    "mixHash" : "0xc118e4f31205971f5122fd70d36adf7f7271ba94308b85223b36f52f9b8d286f",
-                    "nonce" : "0xea70f40434eebcb5",
+                    "hash" : "0xeb407baa6b36f0421f61dc6affec1ee7116c4ec9b803d241e8026decdb85c275",
+                    "mixHash" : "0x76d35be025f5eca89d8af4c5d8b524459035da1a12182ca9451e559d3887bb84",
+                    "nonce" : "0xebd69d5736bf4737",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0xf85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xd53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0dd57e7f36ffae9e2cf8a9efc95ff57efc8233fcb80d7b33b149ae6c6d03d25baa0d53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145a0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0c118e4f31205971f5122fd70d36adf7f7271ba94308b85223b36f52f9b8d286f88ea70f40434eebcb5f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba035b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bba0663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407c0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0dd57e7f36ffae9e2cf8a9efc95ff57efc8233fcb80d7b33b149ae6c6d03d25baa0d53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145a0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a076d35be025f5eca89d8af4c5d8b524459035da1a12182ca9451e559d3887bb8488ebd69d5736bf4737f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba035b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bba0663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdcee10fc476159f5514385458bed22bd32ecd94b0108848556962a51c45631c6",
+        "lastblockhash" : "0xeb407baa6b36f0421f61dc6affec1ee7116c4ec9b803d241e8026decdb85c275",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g1v0.json
index 7a73a41bf..86a83c9e6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g1v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_3711_37111_25000_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g1v0Filler.json",
+            "sourceHash" : "4d1a89109bfcc2859d756e383bacbee988d2c44c6d5c799898ae3896465475f5"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x5448ff2bf42028f9d23a8252f00a321644d74373de5659997bdbea50d81666a0",
+                    "mixHash" : "0xd607ffc91271ba871bbbad33f01d916b8216af46bce8ba68ec7807cfcae918b9",
+                    "nonce" : "0xebb92622e8c4f6a6",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0xa020341b9a9d93e6e5757b269e2ac36ee065e1a9d3cdc9e6b51ceb55efe36a3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9b550325f1ed5a41ec7742f224f009c05adb714b8e89af8796cd029d4e0d0c69",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a020341b9a9d93e6e5757b269e2ac36ee065e1a9d3cdc9e6b51ceb55efe36a3fa09b550325f1ed5a41ec7742f224f009c05adb714b8e89af8796cd029d4e0d0c69a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083015f908203e880a0d607ffc91271ba871bbbad33f01d916b8216af46bce8ba68ec7807cfcae918b988ebb92622e8c4f6a6f90229f90226010183015f9094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba06dd685e4783302373aaa38753e16c3ee9fecf359f4c7af1c1ce5aca1093a6f4fa058ae4fd09eeb369e772b3b5f3a905a719d3c7a657ec587b15228ac2c8467f7d5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x6dd685e4783302373aaa38753e16c3ee9fecf359f4c7af1c1ce5aca1093a6f4f",
+                        "s" : "0x58ae4fd09eeb369e772b3b5f3a905a719d3c7a657ec587b15228ac2c8467f7d5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5448ff2bf42028f9d23a8252f00a321644d74373de5659997bdbea50d81666a0",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62f628a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7609d76",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g2v0.json
index 7a73a41bf..95409f63b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g2v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_3711_37111_25000_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g2v0Filler.json",
+            "sourceHash" : "bc48a85267920d854fa5bf3384ce00249b7f742b3a60e650e4761995490a3d00"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x29f2553fa6efd2270b8c8a4f02445e3271522c0dc8e7afaa52066ad5a44aae09",
+                    "mixHash" : "0x330ec9433910ff9e49ebbe371fd2ba20b74d2638244c55a014ec89f4e6f9deb5",
+                    "nonce" : "0x805524f3ae775a4c",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x60b271b6516e4f49425fb4ac56bb7f97761d7bdf9786bcffdcce0dee3be30a30",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x18affa0a0509422e699662d66a334e6ca8411f20c8c4eb149a3cb5fa637418ad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a060b271b6516e4f49425fb4ac56bb7f97761d7bdf9786bcffdcce0dee3be30a30a018affa0a0509422e699662d66a334e6ca8411f20c8c4eb149a3cb5fa637418ada0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301adb08203e880a0330ec9433910ff9e49ebbe371fd2ba20b74d2638244c55a014ec89f4e6f9deb588805524f3ae775a4cf90229f9022601018301adb094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba0647dd7d94872cea21579ebd055a3f92206617ab52baac6bc3d9dbd6a46bfe4bea02ac8d4e15f02fa0f951e3c8903ecb0d0bf50aae4abcede9a45d8b703d300211cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x647dd7d94872cea21579ebd055a3f92206617ab52baac6bc3d9dbd6a46bfe4be",
+                        "s" : "0x2ac8d4e15f02fa0f951e3c8903ecb0d0bf50aae4abcede9a45d8b703d300211c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x29f2553fa6efd2270b8c8a4f02445e3271522c0dc8e7afaa52066ad5a44aae09",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af62fb0aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7604f56",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g3v0.json
index 7a73a41bf..e75448bb2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g3v0.json
@@ -1,2 +1,228 @@
 {
+    "modexp_9_3711_37111_25000_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g3v0Filler.json",
+            "sourceHash" : "4d9cc951b6ce106397a1918b8d22b2d5f5db0f380ba0bbf4f13acbfeb0d8a3d0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x9419f1aaf10e4ae39bbd1c24a0d7fccfa2d35c9b0b36ceefe05cf2bad99d1cc6",
+                    "mixHash" : "0xc6fc273699b287af2b554286782d3ab72d6261082611e990e87e5c672fe1cab6",
+                    "nonce" : "0x180b4e629f2433ed",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x29c92115e67eec179ba0279b9e30f701c874df4651f8175038774f782cfa75d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe4874a719d6d52a0963a196963986a92d4c07a9d03fcb233e5753aa068cfd0da",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a029c92115e67eec179ba0279b9e30f701c874df4651f8175038774f782cfa75d6a0e4874a719d6d52a0963a196963986a92d4c07a9d03fcb233e5753aa068cfd0daa0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083030d408203e880a0c6fc273699b287af2b554286782d3ab72d6261082611e990e87e5c672fe1cab688180b4e629f2433edf90229f90226010183030d4094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0cf0bf07c06e34b4bd3d3ae7272567f467dfb13b4b5ca6a3b59ca8f8eefcf5552a06bad042b7c089dddf86904e30159c0da2c550db275175f6f5b3cad787f3f779ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xcf0bf07c06e34b4bd3d3ae7272567f467dfb13b4b5ca6a3b59ca8f8eefcf5552",
+                        "s" : "0x6bad042b7c089dddf86904e30159c0da2c550db275175f6f5b3cad787f3f779e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9419f1aaf10e4ae39bbd1c24a0d7fccfa2d35c9b0b36ceefe05cf2bad99d1cc6",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x29a2241af631103a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75eefc6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g0v0.json
index 592007633..5c7b7e628 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g0v0Filler.json",
             "sourceHash" : "2a71d6a197956287bf1107215e01a412c3960abd5f657eff5d96f5a8873d0176"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x013829",
-                    "hash" : "0x4e2977488784f2ec10dac9aafe55742eab51afaab326551f3e07ae9eec85a330",
-                    "mixHash" : "0x98936635e80d7409cb0da130cd5677dd1db117e95b9c969e166584aadc0a9cac",
-                    "nonce" : "0x513658648d436cbc",
+                    "hash" : "0xcdc3a814aac784e26d7b5b5c7689ff0bd29e341f83df1029248551877dea9f4f",
+                    "mixHash" : "0x6dde3fb8dae4f04e413e72965f3ad17ba7dbeec7b1391c1c914c4b56255b3d3f",
+                    "nonce" : "0x41552aa8c5ed8183",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x45b5ba62e06362048463672043f33e897feb17da9e883f69ab3b4dc0397566c2",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xc6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0155e8bcdfd8de68398a1b7fdc06c3978a87591b13e6ce5851bc2cbecfb946c0ea0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a045b5ba62e06362048463672043f33e897feb17da9e883f69ab3b4dc0397566c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400830138298203e880a098936635e80d7409cb0da130cd5677dd1db117e95b9c969e166584aadc0a9cac88513658648d436cbcf90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
+                "rlp" : "0xf90307f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0155e8bcdfd8de68398a1b7fdc06c3978a87591b13e6ce5851bc2cbecfb946c0ea0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a045b5ba62e06362048463672043f33e897feb17da9e883f69ab3b4dc0397566c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400830138298203e880a06dde3fb8dae4f04e413e72965f3ad17ba7dbeec7b1391c1c914c4b56255b3d3f8841552aa8c5ed8183f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e2977488784f2ec10dac9aafe55742eab51afaab326551f3e07ae9eec85a330",
+        "lastblockhash" : "0xcdc3a814aac784e26d7b5b5c7689ff0bd29e341f83df1029248551877dea9f4f",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g0v0Filler.json",
             "sourceHash" : "2a71d6a197956287bf1107215e01a412c3960abd5f657eff5d96f5a8873d0176"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xca91",
-                    "hash" : "0x906c6a61d044b227d316e6ee1108a7428d07c342156d869ecce9f43fd9baef12",
-                    "mixHash" : "0x9f2477740906102152f4e28167ccaa9eed6bfd05175b65498b07c1165ccc42a3",
-                    "nonce" : "0x958b05954efc7310",
+                    "hash" : "0x40dfc3d1ff5e095b05077c24f0fd7882c43d58ff90b2979dc71cd1f3e0e3fda5",
+                    "mixHash" : "0x6146152f397ac1220e18162b86cad5d87673f98b23ee7c1d6e4598fb16fd0325",
+                    "nonce" : "0x6bd8ed88bcf9c3ff",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xc84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0c",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0xc6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a09f2477740906102152f4e28167ccaa9eed6bfd05175b65498b07c1165ccc42a388958b05954efc7310f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
+                "rlp" : "0xf90306f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a06146152f397ac1220e18162b86cad5d87673f98b23ee7c1d6e4598fb16fd0325886bd8ed88bcf9c3fff90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x906c6a61d044b227d316e6ee1108a7428d07c342156d869ecce9f43fd9baef12",
+        "lastblockhash" : "0x40dfc3d1ff5e095b05077c24f0fd7882c43d58ff90b2979dc71cd1f3e0e3fda5",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g0v0Filler.json",
             "sourceHash" : "2a71d6a197956287bf1107215e01a412c3960abd5f657eff5d96f5a8873d0176"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xca91",
-                    "hash" : "0x003b4d60cf8aa3a3e07e6fede69a9d35b88ccaec3b02138afe50444df86def90",
-                    "mixHash" : "0xd486ec4cb7d9f0c16ec714d68146c5669678074a765fb5c95f4382f5385558ec",
-                    "nonce" : "0xe79b21f5156c2381",
+                    "hash" : "0xa48a1cf6f3ee425b5700cfa9c1fd851a7251f4efd3faad5adc19876a2cbd9242",
+                    "mixHash" : "0x914ea42506466d728c10bdae93686766b1182498dd3bd330ecfb6fda964f1a57",
+                    "nonce" : "0x0310cd416cdd703c",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xc84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0c",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0xc6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a0d486ec4cb7d9f0c16ec714d68146c5669678074a765fb5c95f4382f5385558ec88e79b21f5156c2381f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
+                "rlp" : "0xf90306f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a0914ea42506466d728c10bdae93686766b1182498dd3bd330ecfb6fda964f1a57880310cd416cdd703cf90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x003b4d60cf8aa3a3e07e6fede69a9d35b88ccaec3b02138afe50444df86def90",
+        "lastblockhash" : "0xa48a1cf6f3ee425b5700cfa9c1fd851a7251f4efd3faad5adc19876a2cbd9242",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g1v0.json
index 7a73a41bf..e4b190c4c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g1v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g1v0Filler.json",
+            "sourceHash" : "8991aadb474dee6d5e9ee1e6b52b7ad3877ee021c4c10c8075781f44df4eb939"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x013829",
+                    "hash" : "0xa04e1e2e2f1c0e3d078bffcd3f97cb0a18636af0d3643d3ac5da07bded3e0682",
+                    "mixHash" : "0x78862d491594a4621faaeb958a4f977e9e8da9eea6e81897ba8de00d7c053faa",
+                    "nonce" : "0x063001b8d8327f38",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x45b5ba62e06362048463672043f33e897feb17da9e883f69ab3b4dc0397566c2",
+                    "stateRoot" : "0x155e8bcdfd8de68398a1b7fdc06c3978a87591b13e6ce5851bc2cbecfb946c0e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x866b2015261709024e453293251adcd060bf2e3ea416ed51cf9abae0f9bdb482",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90306f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0155e8bcdfd8de68398a1b7fdc06c3978a87591b13e6ce5851bc2cbecfb946c0ea0866b2015261709024e453293251adcd060bf2e3ea416ed51cf9abae0f9bdb482a045b5ba62e06362048463672043f33e897feb17da9e883f69ab3b4dc0397566c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400830138298203e880a078862d491594a4621faaeb958a4f977e9e8da9eea6e81897ba8de00d7c053faa88063001b8d8327f38f90105f90102800183015f9094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba0c1217e9f372b0a4b677d8564c437f9ab999f5d2a7ac3e9be689825298a1aa184a04d77d260460f9f5713ee5c597ed5ba9b60fe4a0becf6726f4cd4e2e138674978c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1217e9f372b0a4b677d8564c437f9ab999f5d2a7ac3e9be689825298a1aa184",
+                        "s" : "0x4d77d260460f9f5713ee5c597ed5ba9b60fe4a0becf6726f4cd4e2e138674978",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa04e1e2e2f1c0e3d078bffcd3f97cb0a18636af0d3643d3ac5da07bded3e0682",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d3829",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9ec7d7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d0g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g1v0Filler.json",
+            "sourceHash" : "8991aadb474dee6d5e9ee1e6b52b7ad3877ee021c4c10c8075781f44df4eb939"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca91",
+                    "hash" : "0x5124724fa7e30eb185c2b2e73166787ded212d7b37a7972aed2f0a2541e3a651",
+                    "mixHash" : "0x9ae7640b1f6c08e5d8b6b27a0342e61e66b3fb46915c5b54e82fcd5e02500b2b",
+                    "nonce" : "0x3da66768ee5631f6",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0c",
+                    "stateRoot" : "0xe9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x866b2015261709024e453293251adcd060bf2e3ea416ed51cf9abae0f9bdb482",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a0866b2015261709024e453293251adcd060bf2e3ea416ed51cf9abae0f9bdb482a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a09ae7640b1f6c08e5d8b6b27a0342e61e66b3fb46915c5b54e82fcd5e02500b2b883da66768ee5631f6f90105f90102800183015f9094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba0c1217e9f372b0a4b677d8564c437f9ab999f5d2a7ac3e9be689825298a1aa184a04d77d260460f9f5713ee5c597ed5ba9b60fe4a0becf6726f4cd4e2e138674978c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1217e9f372b0a4b677d8564c437f9ab999f5d2a7ac3e9be689825298a1aa184",
+                        "s" : "0x4d77d260460f9f5713ee5c597ed5ba9b60fe4a0becf6726f4cd4e2e138674978",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5124724fa7e30eb185c2b2e73166787ded212d7b37a7972aed2f0a2541e3a651",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca91",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f356f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d0g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g1v0Filler.json",
+            "sourceHash" : "8991aadb474dee6d5e9ee1e6b52b7ad3877ee021c4c10c8075781f44df4eb939"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca91",
+                    "hash" : "0xaa59c4f49e7f4a36780cdde5c10cda30bbdc60fa2ccafbc3a963612397b0adb0",
+                    "mixHash" : "0xe51672b01b70d301254a374622bf7f8fd925795ecafa5ebbe386d7ba60f3ba25",
+                    "nonce" : "0xb275c20d9ab62c7b",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0c",
+                    "stateRoot" : "0xe9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x866b2015261709024e453293251adcd060bf2e3ea416ed51cf9abae0f9bdb482",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a0866b2015261709024e453293251adcd060bf2e3ea416ed51cf9abae0f9bdb482a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a0e51672b01b70d301254a374622bf7f8fd925795ecafa5ebbe386d7ba60f3ba2588b275c20d9ab62c7bf90105f90102800183015f9094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba0c1217e9f372b0a4b677d8564c437f9ab999f5d2a7ac3e9be689825298a1aa184a04d77d260460f9f5713ee5c597ed5ba9b60fe4a0becf6726f4cd4e2e138674978c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1217e9f372b0a4b677d8564c437f9ab999f5d2a7ac3e9be689825298a1aa184",
+                        "s" : "0x4d77d260460f9f5713ee5c597ed5ba9b60fe4a0becf6726f4cd4e2e138674978",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaa59c4f49e7f4a36780cdde5c10cda30bbdc60fa2ccafbc3a963612397b0adb0",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca91",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f356f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g2v0.json
index 7a73a41bf..71adbf9f7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g2v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d0g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g2v0Filler.json",
+            "sourceHash" : "03f4cf778bc38d2503f714fb7e328fc47d518bd386f4d44a521a45dd87a7cd9e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x013829",
+                    "hash" : "0xb8322ead6282e95e1ecfe0c61bba1adcae85bfa910b79d531f9784c06343e65c",
+                    "mixHash" : "0xcd5fb5efdaa61ba7f46dbec854e0de0a71d343b960c2e9bb9e62c6d0dfdc3902",
+                    "nonce" : "0x994460a9f60b5be8",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x45b5ba62e06362048463672043f33e897feb17da9e883f69ab3b4dc0397566c2",
+                    "stateRoot" : "0x155e8bcdfd8de68398a1b7fdc06c3978a87591b13e6ce5851bc2cbecfb946c0e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd385062cf2d10f59eed61231761b6df98304ff5ad18bc7ec4bf4433f8da49716",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90306f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0155e8bcdfd8de68398a1b7fdc06c3978a87591b13e6ce5851bc2cbecfb946c0ea0d385062cf2d10f59eed61231761b6df98304ff5ad18bc7ec4bf4433f8da49716a045b5ba62e06362048463672043f33e897feb17da9e883f69ab3b4dc0397566c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400830138298203e880a0cd5fb5efdaa61ba7f46dbec854e0de0a71d343b960c2e9bb9e62c6d0dfdc390288994460a9f60b5be8f90105f9010280018301adb094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca012d0c8de8b605ce53daa4444fc4db1d3246345d9048fa09fa147aa40fc2dc135a0713199bc28be6ace921404f3e80b2dc40b7c7ef6d10e0996aec27466e719c529c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x12d0c8de8b605ce53daa4444fc4db1d3246345d9048fa09fa147aa40fc2dc135",
+                        "s" : "0x713199bc28be6ace921404f3e80b2dc40b7c7ef6d10e0996aec27466e719c529",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb8322ead6282e95e1ecfe0c61bba1adcae85bfa910b79d531f9784c06343e65c",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d3829",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9ec7d7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d0g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g2v0Filler.json",
+            "sourceHash" : "03f4cf778bc38d2503f714fb7e328fc47d518bd386f4d44a521a45dd87a7cd9e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca91",
+                    "hash" : "0x03715359393bf18cb44029f4378338ff64c992f1da8d7d05eaab1bc9f26e7219",
+                    "mixHash" : "0x0d2e450164726962671c269861a8acb87fbd9e0b9c76e44f1e7f328d5736f1ab",
+                    "nonce" : "0xda0668dbff9aca38",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0c",
+                    "stateRoot" : "0xe9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd385062cf2d10f59eed61231761b6df98304ff5ad18bc7ec4bf4433f8da49716",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a0d385062cf2d10f59eed61231761b6df98304ff5ad18bc7ec4bf4433f8da49716a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a00d2e450164726962671c269861a8acb87fbd9e0b9c76e44f1e7f328d5736f1ab88da0668dbff9aca38f90105f9010280018301adb094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca012d0c8de8b605ce53daa4444fc4db1d3246345d9048fa09fa147aa40fc2dc135a0713199bc28be6ace921404f3e80b2dc40b7c7ef6d10e0996aec27466e719c529c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x12d0c8de8b605ce53daa4444fc4db1d3246345d9048fa09fa147aa40fc2dc135",
+                        "s" : "0x713199bc28be6ace921404f3e80b2dc40b7c7ef6d10e0996aec27466e719c529",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x03715359393bf18cb44029f4378338ff64c992f1da8d7d05eaab1bc9f26e7219",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca91",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f356f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d0g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g2v0Filler.json",
+            "sourceHash" : "03f4cf778bc38d2503f714fb7e328fc47d518bd386f4d44a521a45dd87a7cd9e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca91",
+                    "hash" : "0x058a6ab498eff838fa1011eaf1431feccab7501ab96121991c0d880b901e6c4e",
+                    "mixHash" : "0xde919f9ddf091747addd87cd011e0898f0181e3425006dd7cb94d97c1f20863b",
+                    "nonce" : "0xf71532ab3631ac1c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0c",
+                    "stateRoot" : "0xe9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd385062cf2d10f59eed61231761b6df98304ff5ad18bc7ec4bf4433f8da49716",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a0d385062cf2d10f59eed61231761b6df98304ff5ad18bc7ec4bf4433f8da49716a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a0de919f9ddf091747addd87cd011e0898f0181e3425006dd7cb94d97c1f20863b88f71532ab3631ac1cf90105f9010280018301adb094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca012d0c8de8b605ce53daa4444fc4db1d3246345d9048fa09fa147aa40fc2dc135a0713199bc28be6ace921404f3e80b2dc40b7c7ef6d10e0996aec27466e719c529c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x12d0c8de8b605ce53daa4444fc4db1d3246345d9048fa09fa147aa40fc2dc135",
+                        "s" : "0x713199bc28be6ace921404f3e80b2dc40b7c7ef6d10e0996aec27466e719c529",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x058a6ab498eff838fa1011eaf1431feccab7501ab96121991c0d880b901e6c4e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca91",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f356f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g3v0.json
index 7a73a41bf..210d9f6a7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g3v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d0g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g3v0Filler.json",
+            "sourceHash" : "97fcc2971393f4ab8892d2c7a1e7d565b656f90ecbcce4075bc93c15ad3efff8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x013829",
+                    "hash" : "0x19c5522f9c14cea62613e10dd6baa6900c1ed789a301ad877a1cef5173c488ca",
+                    "mixHash" : "0xf375bed18c1a87c590bede4760e3db2cd962ad4e9301406d40990058bf2a8a0c",
+                    "nonce" : "0x9804701b2705b8d0",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x45b5ba62e06362048463672043f33e897feb17da9e883f69ab3b4dc0397566c2",
+                    "stateRoot" : "0x155e8bcdfd8de68398a1b7fdc06c3978a87591b13e6ce5851bc2cbecfb946c0e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x94451536dd3ad20772dc672965cc2541bf717f88a15741269dfe039a5cbe5706",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90306f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0155e8bcdfd8de68398a1b7fdc06c3978a87591b13e6ce5851bc2cbecfb946c0ea094451536dd3ad20772dc672965cc2541bf717f88a15741269dfe039a5cbe5706a045b5ba62e06362048463672043f33e897feb17da9e883f69ab3b4dc0397566c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400830138298203e880a0f375bed18c1a87c590bede4760e3db2cd962ad4e9301406d40990058bf2a8a0c889804701b2705b8d0f90105f90102800183030d4094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca08edbeaa6317122e612a679f279a4a3c8460383f4ea824038e5a4975ca635699aa00e3fdc29c8db2f8ab2a0581e6706e3fae58a6f52e96ede4e14ec518c84b68e34c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8edbeaa6317122e612a679f279a4a3c8460383f4ea824038e5a4975ca635699a",
+                        "s" : "0x0e3fdc29c8db2f8ab2a0581e6706e3fae58a6f52e96ede4e14ec518c84b68e34",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x19c5522f9c14cea62613e10dd6baa6900c1ed789a301ad877a1cef5173c488ca",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d3829",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9ec7d7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d0g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g3v0Filler.json",
+            "sourceHash" : "97fcc2971393f4ab8892d2c7a1e7d565b656f90ecbcce4075bc93c15ad3efff8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca91",
+                    "hash" : "0x8476ab32dbba3349757521208c6c296ce7754c359e7500fd71edce05387420c4",
+                    "mixHash" : "0x4f3a3febcc041d051b476571009587c511a0de68b00827dc7e0330290c422ed7",
+                    "nonce" : "0x052557fee3c3315b",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0c",
+                    "stateRoot" : "0xe9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x94451536dd3ad20772dc672965cc2541bf717f88a15741269dfe039a5cbe5706",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a094451536dd3ad20772dc672965cc2541bf717f88a15741269dfe039a5cbe5706a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a04f3a3febcc041d051b476571009587c511a0de68b00827dc7e0330290c422ed788052557fee3c3315bf90105f90102800183030d4094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca08edbeaa6317122e612a679f279a4a3c8460383f4ea824038e5a4975ca635699aa00e3fdc29c8db2f8ab2a0581e6706e3fae58a6f52e96ede4e14ec518c84b68e34c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8edbeaa6317122e612a679f279a4a3c8460383f4ea824038e5a4975ca635699a",
+                        "s" : "0x0e3fdc29c8db2f8ab2a0581e6706e3fae58a6f52e96ede4e14ec518c84b68e34",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8476ab32dbba3349757521208c6c296ce7754c359e7500fd71edce05387420c4",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca91",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f356f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d0g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g3v0Filler.json",
+            "sourceHash" : "97fcc2971393f4ab8892d2c7a1e7d565b656f90ecbcce4075bc93c15ad3efff8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca91",
+                    "hash" : "0xa104ecfec81e181c8f57d82a34ec24ba31d303ba7412cea786a5cd8dfdcfd56d",
+                    "mixHash" : "0x0ebf1c66109f080d5b5b4218f96a93f3d5501cf1e494bc5a6be960cd9df8653a",
+                    "nonce" : "0x20af8cb1d26a7c96",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0c",
+                    "stateRoot" : "0xe9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x94451536dd3ad20772dc672965cc2541bf717f88a15741269dfe039a5cbe5706",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a094451536dd3ad20772dc672965cc2541bf717f88a15741269dfe039a5cbe5706a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a00ebf1c66109f080d5b5b4218f96a93f3d5501cf1e494bc5a6be960cd9df8653a8820af8cb1d26a7c96f90105f90102800183030d4094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca08edbeaa6317122e612a679f279a4a3c8460383f4ea824038e5a4975ca635699aa00e3fdc29c8db2f8ab2a0581e6706e3fae58a6f52e96ede4e14ec518c84b68e34c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8edbeaa6317122e612a679f279a4a3c8460383f4ea824038e5a4975ca635699a",
+                        "s" : "0x0e3fdc29c8db2f8ab2a0581e6706e3fae58a6f52e96ede4e14ec518c84b68e34",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa104ecfec81e181c8f57d82a34ec24ba31d303ba7412cea786a5cd8dfdcfd56d",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca91",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f356f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g0v0.json
index 53a564d83..f4d4de90b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d10g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g0v0Filler.json",
             "sourceHash" : "5b76be1bec3888a2a608ab1fcd27e0ad0a64158448b7919bd8b340e0acf61ba6"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0xa2e81d0054229707ff5cb6c1c8c51ec0e43c29e36b68caa19a8022f9c234628c",
-                    "mixHash" : "0xabc8b068805465c1dfcc619ba7e4c6089dd776a130403479e87162ced96df79c",
-                    "nonce" : "0x46b737f491a016d9",
+                    "hash" : "0xe015961986a306e5e32b92cfa358eb5fcf6fd8685b4e8189fcc1a5ad6d7ac1f3",
+                    "mixHash" : "0x038ab89c64f246142809fd1c16b8941225480176dec7c49d08f7e96eaaae22b4",
+                    "nonce" : "0xdcacef959b6056b4",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x6e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0abc8b068805465c1dfcc619ba7e4c6089dd776a130403479e87162ced96df79c8846b737f491a016d9f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0038ab89c64f246142809fd1c16b8941225480176dec7c49d08f7e96eaaae22b488dcacef959b6056b4f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2e81d0054229707ff5cb6c1c8c51ec0e43c29e36b68caa19a8022f9c234628c",
+        "lastblockhash" : "0xe015961986a306e5e32b92cfa358eb5fcf6fd8685b4e8189fcc1a5ad6d7ac1f3",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d10g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g0v0Filler.json",
             "sourceHash" : "5b76be1bec3888a2a608ab1fcd27e0ad0a64158448b7919bd8b340e0acf61ba6"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0xf68699e620d6802ba0801af6176158f85073dab969dc21af3918198a4427d4c6",
-                    "mixHash" : "0x4ebc10b029a9a355f5251d85c9b21fb452d6d375f42120d5ef2ad2c10272bafa",
-                    "nonce" : "0xd259bd3a4600cf23",
+                    "hash" : "0x18e6db601da9db4ee818faa93d63990eac184ea9e3752b467519f642210888c0",
+                    "mixHash" : "0x66f2e2c111c1e53f4c021b6296f90adc0941bf24ba2ac27e18b0112a7970aee8",
+                    "nonce" : "0x27e28b260c9f8a28",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0x6e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a04ebc10b029a9a355f5251d85c9b21fb452d6d375f42120d5ef2ad2c10272bafa88d259bd3a4600cf23f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a066f2e2c111c1e53f4c021b6296f90adc0941bf24ba2ac27e18b0112a7970aee88827e28b260c9f8a28f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf68699e620d6802ba0801af6176158f85073dab969dc21af3918198a4427d4c6",
+        "lastblockhash" : "0x18e6db601da9db4ee818faa93d63990eac184ea9e3752b467519f642210888c0",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d10g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g0v0Filler.json",
             "sourceHash" : "5b76be1bec3888a2a608ab1fcd27e0ad0a64158448b7919bd8b340e0acf61ba6"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0x9fce447530e651592fb53d6adadf371760cec4b915050d6b350aa790d6f14269",
-                    "mixHash" : "0xd7e01c325a18bb54c65ca55bbd17a2c7daa3a7571db611f48f77778bc89a1e88",
-                    "nonce" : "0xc14141533fe0a7b9",
+                    "hash" : "0xc617ea5a90f7d60392788f80418e942558dcd3e740efb63a12c7ac1e4ce0aad7",
+                    "mixHash" : "0x5ee1de20792b663a9b8360a4619f54d90825aa77b9cedc64edcbb6ee5b9d87fa",
+                    "nonce" : "0x1dfea6a365dff6ee",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0x6e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0d7e01c325a18bb54c65ca55bbd17a2c7daa3a7571db611f48f77778bc89a1e8888c14141533fe0a7b9f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a05ee1de20792b663a9b8360a4619f54d90825aa77b9cedc64edcbb6ee5b9d87fa881dfea6a365dff6eef8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9fce447530e651592fb53d6adadf371760cec4b915050d6b350aa790d6f14269",
+        "lastblockhash" : "0xc617ea5a90f7d60392788f80418e942558dcd3e740efb63a12c7ac1e4ce0aad7",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g1v0.json
index 7a73a41bf..2140c4f5b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d10g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g1v0Filler.json",
+            "sourceHash" : "8396e3c38630d23d0f91275386f861c437761d8c5b3296446939f16d1436fec9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x7461eb17c88af281e63f541cd412e5a18bc4e97046f5a0b07a88d2f7fe7446d2",
+                    "mixHash" : "0xf042de1610ed7e7f73a36069d6398513243848085f71870ee26f7f9711ce26aa",
+                    "nonce" : "0x3b142068177627fe",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0xf3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2a06db5c511e02891d1bab7022bf78e3a54122aa3be57464460bd0d18652d8b6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa02a06db5c511e02891d1bab7022bf78e3a54122aa3be57464460bd0d18652d8b6a052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0f042de1610ed7e7f73a36069d6398513243848085f71870ee26f7f9711ce26aa883b142068177627fef8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba0df03a1147cc6b3cd356e866e8de948c4c9fc7aa7989307abf11641a6ede0a6c1a00e4d0f0f193dcdd41ce5b26f6ac3a5631735cfb81e8b4e614e01d006f69ef623c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdf03a1147cc6b3cd356e866e8de948c4c9fc7aa7989307abf11641a6ede0a6c1",
+                        "s" : "0x0e4d0f0f193dcdd41ce5b26f6ac3a5631735cfb81e8b4e614e01d006f69ef623",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7461eb17c88af281e63f541cd412e5a18bc4e97046f5a0b07a88d2f7fe7446d2",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d10g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g1v0Filler.json",
+            "sourceHash" : "8396e3c38630d23d0f91275386f861c437761d8c5b3296446939f16d1436fec9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x75980fba67bc5f1829ebf73f5c191f884aa52d77f079d096f8273226d9bdac64",
+                    "mixHash" : "0x5bbcd748feffe085a108bf8023960cf44ef2d440536abd69202218b2774435df",
+                    "nonce" : "0xb7badc7f94a33ef6",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2a06db5c511e02891d1bab7022bf78e3a54122aa3be57464460bd0d18652d8b6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a02a06db5c511e02891d1bab7022bf78e3a54122aa3be57464460bd0d18652d8b6a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a05bbcd748feffe085a108bf8023960cf44ef2d440536abd69202218b2774435df88b7badc7f94a33ef6f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba0df03a1147cc6b3cd356e866e8de948c4c9fc7aa7989307abf11641a6ede0a6c1a00e4d0f0f193dcdd41ce5b26f6ac3a5631735cfb81e8b4e614e01d006f69ef623c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdf03a1147cc6b3cd356e866e8de948c4c9fc7aa7989307abf11641a6ede0a6c1",
+                        "s" : "0x0e4d0f0f193dcdd41ce5b26f6ac3a5631735cfb81e8b4e614e01d006f69ef623",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x75980fba67bc5f1829ebf73f5c191f884aa52d77f079d096f8273226d9bdac64",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d10g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g1v0Filler.json",
+            "sourceHash" : "8396e3c38630d23d0f91275386f861c437761d8c5b3296446939f16d1436fec9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x492a164a5d4518706f29aca70456919c9bf1e1d34528b4243d9a45963e745fc7",
+                    "mixHash" : "0xee8c25db0f6024599007b1375a1cc3cc5a0a3caad771c807932cfedc34a018f5",
+                    "nonce" : "0x7d6254c61abf6776",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2a06db5c511e02891d1bab7022bf78e3a54122aa3be57464460bd0d18652d8b6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a02a06db5c511e02891d1bab7022bf78e3a54122aa3be57464460bd0d18652d8b6a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0ee8c25db0f6024599007b1375a1cc3cc5a0a3caad771c807932cfedc34a018f5887d6254c61abf6776f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba0df03a1147cc6b3cd356e866e8de948c4c9fc7aa7989307abf11641a6ede0a6c1a00e4d0f0f193dcdd41ce5b26f6ac3a5631735cfb81e8b4e614e01d006f69ef623c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdf03a1147cc6b3cd356e866e8de948c4c9fc7aa7989307abf11641a6ede0a6c1",
+                        "s" : "0x0e4d0f0f193dcdd41ce5b26f6ac3a5631735cfb81e8b4e614e01d006f69ef623",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x492a164a5d4518706f29aca70456919c9bf1e1d34528b4243d9a45963e745fc7",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g2v0.json
index 7a73a41bf..eab28792a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d10g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g2v0Filler.json",
+            "sourceHash" : "7ece978f164a3babf9889b9d18c4599ef567acb25be6183a8dcdfa769131e509"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x69876c576bf217d5d4fc0c21b01acedc93738afcc0aa0abc2e2e41c94310897a",
+                    "mixHash" : "0x1c637044b392dfb14aa713a6e4c8ebcdd50da32bc96f3b66b2002a5625e017f6",
+                    "nonce" : "0x961c204fbe1256df",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0xf3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x18df00ff28b2fd627ce7645654702b69a495962d06ed946a0811f2407869a37b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa018df00ff28b2fd627ce7645654702b69a495962d06ed946a0811f2407869a37ba052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a01c637044b392dfb14aa713a6e4c8ebcdd50da32bc96f3b66b2002a5625e017f688961c204fbe1256dff8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ca0825649f788c912f64dbd2992fc3a93d1f5aa03baa2804f1b708f77dec5e77439a07dde0a60db1cff1fe3e694b9354c9fad1c32066b5e8ec18945777186e960a793c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x825649f788c912f64dbd2992fc3a93d1f5aa03baa2804f1b708f77dec5e77439",
+                        "s" : "0x7dde0a60db1cff1fe3e694b9354c9fad1c32066b5e8ec18945777186e960a793",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x69876c576bf217d5d4fc0c21b01acedc93738afcc0aa0abc2e2e41c94310897a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d10g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g2v0Filler.json",
+            "sourceHash" : "7ece978f164a3babf9889b9d18c4599ef567acb25be6183a8dcdfa769131e509"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x24400e3862bb0331a61cae888b27c88f6ce0ddd4ae18eca65cfb14180e6243d6",
+                    "mixHash" : "0xf02d02957bf07674a5dc7e58fff519657359a8ec9a883e487ca0fe0507608a4c",
+                    "nonce" : "0xe7b58620f4d0bb23",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x18df00ff28b2fd627ce7645654702b69a495962d06ed946a0811f2407869a37b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a018df00ff28b2fd627ce7645654702b69a495962d06ed946a0811f2407869a37ba0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0f02d02957bf07674a5dc7e58fff519657359a8ec9a883e487ca0fe0507608a4c88e7b58620f4d0bb23f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ca0825649f788c912f64dbd2992fc3a93d1f5aa03baa2804f1b708f77dec5e77439a07dde0a60db1cff1fe3e694b9354c9fad1c32066b5e8ec18945777186e960a793c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x825649f788c912f64dbd2992fc3a93d1f5aa03baa2804f1b708f77dec5e77439",
+                        "s" : "0x7dde0a60db1cff1fe3e694b9354c9fad1c32066b5e8ec18945777186e960a793",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x24400e3862bb0331a61cae888b27c88f6ce0ddd4ae18eca65cfb14180e6243d6",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d10g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g2v0Filler.json",
+            "sourceHash" : "7ece978f164a3babf9889b9d18c4599ef567acb25be6183a8dcdfa769131e509"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xe841a1a91d0d3e009e1561b328a0f17f732122b99cfda6ec8424c0ed24ad45dc",
+                    "mixHash" : "0x0188267e2f812558c7b5080ae45a2710a543c9cdf175f91eea18f1f911d42896",
+                    "nonce" : "0x3a018da15f0bd952",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x18df00ff28b2fd627ce7645654702b69a495962d06ed946a0811f2407869a37b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a018df00ff28b2fd627ce7645654702b69a495962d06ed946a0811f2407869a37ba0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a00188267e2f812558c7b5080ae45a2710a543c9cdf175f91eea18f1f911d42896883a018da15f0bd952f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ca0825649f788c912f64dbd2992fc3a93d1f5aa03baa2804f1b708f77dec5e77439a07dde0a60db1cff1fe3e694b9354c9fad1c32066b5e8ec18945777186e960a793c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x825649f788c912f64dbd2992fc3a93d1f5aa03baa2804f1b708f77dec5e77439",
+                        "s" : "0x7dde0a60db1cff1fe3e694b9354c9fad1c32066b5e8ec18945777186e960a793",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe841a1a91d0d3e009e1561b328a0f17f732122b99cfda6ec8424c0ed24ad45dc",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g3v0.json
index 7a73a41bf..76499459e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d10g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g3v0Filler.json",
+            "sourceHash" : "f59ddbd2d5dd3e409f628fea441af8be94f51012bcf9dca90671a0504b5a965b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xfabf6b2e83297c73de7dd80468ef65c678df818f256697a38e63d7eb7d877a01",
+                    "mixHash" : "0xf235db63c709df686f5a2162019402c9a34494d92e602c751c81f777f8e7a01f",
+                    "nonce" : "0x44fec54ca61b79aa",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0xf3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa3da3e5499c6919046cf688155eb0d1cc4f15390c5243700ab1181b06d0ddc8f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa0a3da3e5499c6919046cf688155eb0d1cc4f15390c5243700ab1181b06d0ddc8fa052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0f235db63c709df686f5a2162019402c9a34494d92e602c751c81f777f8e7a01f8844fec54ca61b79aaf8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba0a099f0f5609295d5e1aa330c10641eb874ab64518cbdb7d9728f266635b1564fa036cf34f2b8df8962a3fc6b63cb041337166cfec34188d57bbe39c04a5ae4d44dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa099f0f5609295d5e1aa330c10641eb874ab64518cbdb7d9728f266635b1564f",
+                        "s" : "0x36cf34f2b8df8962a3fc6b63cb041337166cfec34188d57bbe39c04a5ae4d44d",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfabf6b2e83297c73de7dd80468ef65c678df818f256697a38e63d7eb7d877a01",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d10g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g3v0Filler.json",
+            "sourceHash" : "f59ddbd2d5dd3e409f628fea441af8be94f51012bcf9dca90671a0504b5a965b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xa2c1cd26aa4d03db27c169f02be9fc0137f4e2cfe2f7be6cd0ef2452e0524664",
+                    "mixHash" : "0x2da5ecbcbc106d020da07e47d11feb5fd659990e589535e5f1ed52ebc71ebc29",
+                    "nonce" : "0xc4453cb34be0fdf1",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa3da3e5499c6919046cf688155eb0d1cc4f15390c5243700ab1181b06d0ddc8f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0a3da3e5499c6919046cf688155eb0d1cc4f15390c5243700ab1181b06d0ddc8fa0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a02da5ecbcbc106d020da07e47d11feb5fd659990e589535e5f1ed52ebc71ebc2988c4453cb34be0fdf1f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba0a099f0f5609295d5e1aa330c10641eb874ab64518cbdb7d9728f266635b1564fa036cf34f2b8df8962a3fc6b63cb041337166cfec34188d57bbe39c04a5ae4d44dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa099f0f5609295d5e1aa330c10641eb874ab64518cbdb7d9728f266635b1564f",
+                        "s" : "0x36cf34f2b8df8962a3fc6b63cb041337166cfec34188d57bbe39c04a5ae4d44d",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa2c1cd26aa4d03db27c169f02be9fc0137f4e2cfe2f7be6cd0ef2452e0524664",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d10g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g3v0Filler.json",
+            "sourceHash" : "f59ddbd2d5dd3e409f628fea441af8be94f51012bcf9dca90671a0504b5a965b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x3bfb16c745e0b87869422f1ad084eb3ea66fc8f085751517cb31178bbeaa20a6",
+                    "mixHash" : "0x4a5aab978eebfbb05b8b803be5510f9ce7043118e6958b0c00f4e135b0f43c07",
+                    "nonce" : "0xb6ea048798339df7",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa3da3e5499c6919046cf688155eb0d1cc4f15390c5243700ab1181b06d0ddc8f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0a3da3e5499c6919046cf688155eb0d1cc4f15390c5243700ab1181b06d0ddc8fa0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a04a5aab978eebfbb05b8b803be5510f9ce7043118e6958b0c00f4e135b0f43c0788b6ea048798339df7f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba0a099f0f5609295d5e1aa330c10641eb874ab64518cbdb7d9728f266635b1564fa036cf34f2b8df8962a3fc6b63cb041337166cfec34188d57bbe39c04a5ae4d44dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa099f0f5609295d5e1aa330c10641eb874ab64518cbdb7d9728f266635b1564f",
+                        "s" : "0x36cf34f2b8df8962a3fc6b63cb041337166cfec34188d57bbe39c04a5ae4d44d",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3bfb16c745e0b87869422f1ad084eb3ea66fc8f085751517cb31178bbeaa20a6",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g0v0.json
index bd2ef95c4..349b142bf 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d11g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g0v0Filler.json",
             "sourceHash" : "34ed1a7ba34f3d802fb624789f023005ea166e3d39086a10b2ef30ddecbff111"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf46b",
-                    "hash" : "0xa739977e951cc41087e59d4380ea54b381e0bad2708e79203e2472c0d2e27065",
-                    "mixHash" : "0xb14611c83f52c2f50c21dfe53ea09d09fadf86bc74ddf410ec32ca20f00fa602",
-                    "nonce" : "0xc34ae630108ab24f",
+                    "hash" : "0xabaa8ad8e1621e278260305af28785fcba154022a04686b064c0a28562bf0291",
+                    "mixHash" : "0x26077edf643bfcf9f5f30d13967009f087e7028a670bc90a8c455213d7cfa201",
+                    "nonce" : "0xfb7b75a67a0ed5cf",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x0d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x44c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acc198f8c8e8cb28efa3b0dee0bbba8db1d91c4490b6ed45588eaa13150c0a69a044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a00d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f46b8203e880a0b14611c83f52c2f50c21dfe53ea09d09fadf86bc74ddf410ec32ca20f00fa60288c34ae630108ab24ff8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acc198f8c8e8cb28efa3b0dee0bbba8db1d91c4490b6ed45588eaa13150c0a69a044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a00d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f46b8203e880a026077edf643bfcf9f5f30d13967009f087e7028a670bc90a8c455213d7cfa20188fb7b75a67a0ed5cff8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa739977e951cc41087e59d4380ea54b381e0bad2708e79203e2472c0d2e27065",
+        "lastblockhash" : "0xabaa8ad8e1621e278260305af28785fcba154022a04686b064c0a28562bf0291",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d11g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g0v0Filler.json",
             "sourceHash" : "34ed1a7ba34f3d802fb624789f023005ea166e3d39086a10b2ef30ddecbff111"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0x48207271afb779bfb228b7f1fff4c946bd5936704e8707f18635526b455f7df1",
-                    "mixHash" : "0xd5e4801ef1b13798eaca4fa94422ac98ad02532a5b843460c93f80fd40b3b2f1",
-                    "nonce" : "0x056e24aa896e7db7",
+                    "hash" : "0x73d5d964ff74dd56753ffacefaf09766f3cc2f0dd5ac915f0c8e51c3a9910f23",
+                    "mixHash" : "0xe5d9017b3f91b4dced658339dd1d3b4f5802a5896469a42e3a9ff9f18dcfb39e",
+                    "nonce" : "0x6cc02be3b2ad14e0",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0x44c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0d5e4801ef1b13798eaca4fa94422ac98ad02532a5b843460c93f80fd40b3b2f188056e24aa896e7db7f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0e5d9017b3f91b4dced658339dd1d3b4f5802a5896469a42e3a9ff9f18dcfb39e886cc02be3b2ad14e0f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x48207271afb779bfb228b7f1fff4c946bd5936704e8707f18635526b455f7df1",
+        "lastblockhash" : "0x73d5d964ff74dd56753ffacefaf09766f3cc2f0dd5ac915f0c8e51c3a9910f23",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d11g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g0v0Filler.json",
             "sourceHash" : "34ed1a7ba34f3d802fb624789f023005ea166e3d39086a10b2ef30ddecbff111"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0xa45a60e0be2cf82869810bc941b0ac7e2a5ccae1b788b8bbbfba34e82727c200",
-                    "mixHash" : "0xc203f1e7111696b26651cfeee0d45efc6a0da5986eeeb0fcd6353c0352bceebe",
-                    "nonce" : "0x11b593716ac4afa5",
+                    "hash" : "0x9ed14319cd964f975a60a881db64e03d6638b58ed50b040a8563f3dfe1aef5aa",
+                    "mixHash" : "0x937c08030cf6b72d440cc8c02d9c77fabec99784dd2808a19a09b7d6bf8c45fc",
+                    "nonce" : "0x5910871a12a3ad09",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0x44c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0c203f1e7111696b26651cfeee0d45efc6a0da5986eeeb0fcd6353c0352bceebe8811b593716ac4afa5f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0937c08030cf6b72d440cc8c02d9c77fabec99784dd2808a19a09b7d6bf8c45fc885910871a12a3ad09f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa45a60e0be2cf82869810bc941b0ac7e2a5ccae1b788b8bbbfba34e82727c200",
+        "lastblockhash" : "0x9ed14319cd964f975a60a881db64e03d6638b58ed50b040a8563f3dfe1aef5aa",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g1v0.json
index 7a73a41bf..0289a4ed5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g1v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d11g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g1v0Filler.json",
+            "sourceHash" : "d11ee60c94a63c4ab085a6ea1a4801f11d7bc3b0fa6475619ec62826d2ebb1dc"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf46b",
+                    "hash" : "0x6f9a2fcfd7163773c477f012aac9fe8bd6f16d9d396ac387995ece44d0d0acca",
+                    "mixHash" : "0xb003b2e45a50aafe178c332b17b80f3fdbf7f7c5440d7c9320c65635b81bfbb8",
+                    "nonce" : "0xd48ecfec3affdc59",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x0d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81",
+                    "stateRoot" : "0xacc198f8c8e8cb28efa3b0dee0bbba8db1d91c4490b6ed45588eaa13150c0a69",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0cc438e472a0c275b2ae44ef58b15ae8db27d1b9131738d23bc0105b5badcc13",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acc198f8c8e8cb28efa3b0dee0bbba8db1d91c4490b6ed45588eaa13150c0a69a00cc438e472a0c275b2ae44ef58b15ae8db27d1b9131738d23bc0105b5badcc13a00d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f46b8203e880a0b003b2e45a50aafe178c332b17b80f3fdbf7f7c5440d7c9320c65635b81bfbb888d48ecfec3affdc59f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ca02170b80d415f8475c4b65b56beb5e32532a23704c08f9e3ba4932a07bd29c4cca018eb0ed79317c30287fd85f958908187aa778d3609170dba50c247acaa187dadc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2170b80d415f8475c4b65b56beb5e32532a23704c08f9e3ba4932a07bd29c4cc",
+                        "s" : "0x18eb0ed79317c30287fd85f958908187aa778d3609170dba50c247acaa187dad",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6f9a2fcfd7163773c477f012aac9fe8bd6f16d9d396ac387995ece44d0d0acca",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf46b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b95",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d11g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g1v0Filler.json",
+            "sourceHash" : "d11ee60c94a63c4ab085a6ea1a4801f11d7bc3b0fa6475619ec62826d2ebb1dc"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x511a04d8ffb435db40bb4346b51494db4d3a5fef7bcb17208bcf5dd70fd4d8c7",
+                    "mixHash" : "0x47a29d91b74d8969e90d964d065b711ec10d2af57500cd90d6754970cb1e5d6a",
+                    "nonce" : "0xaa25280676e5b1b6",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0cc438e472a0c275b2ae44ef58b15ae8db27d1b9131738d23bc0105b5badcc13",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a00cc438e472a0c275b2ae44ef58b15ae8db27d1b9131738d23bc0105b5badcc13a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a047a29d91b74d8969e90d964d065b711ec10d2af57500cd90d6754970cb1e5d6a88aa25280676e5b1b6f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ca02170b80d415f8475c4b65b56beb5e32532a23704c08f9e3ba4932a07bd29c4cca018eb0ed79317c30287fd85f958908187aa778d3609170dba50c247acaa187dadc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2170b80d415f8475c4b65b56beb5e32532a23704c08f9e3ba4932a07bd29c4cc",
+                        "s" : "0x18eb0ed79317c30287fd85f958908187aa778d3609170dba50c247acaa187dad",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x511a04d8ffb435db40bb4346b51494db4d3a5fef7bcb17208bcf5dd70fd4d8c7",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d11g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g1v0Filler.json",
+            "sourceHash" : "d11ee60c94a63c4ab085a6ea1a4801f11d7bc3b0fa6475619ec62826d2ebb1dc"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x15fa1659f2c1b6a0eec286f3871352ee9bbb618985b7c561e0b6d99e5b8eac0d",
+                    "mixHash" : "0x3cd4698b2a49672a95d1a85b5564ae293235a98a45e0f5b5bcd208380982a5df",
+                    "nonce" : "0x7bfaa5b384ff0994",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0cc438e472a0c275b2ae44ef58b15ae8db27d1b9131738d23bc0105b5badcc13",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a00cc438e472a0c275b2ae44ef58b15ae8db27d1b9131738d23bc0105b5badcc13a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a03cd4698b2a49672a95d1a85b5564ae293235a98a45e0f5b5bcd208380982a5df887bfaa5b384ff0994f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ca02170b80d415f8475c4b65b56beb5e32532a23704c08f9e3ba4932a07bd29c4cca018eb0ed79317c30287fd85f958908187aa778d3609170dba50c247acaa187dadc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2170b80d415f8475c4b65b56beb5e32532a23704c08f9e3ba4932a07bd29c4cc",
+                        "s" : "0x18eb0ed79317c30287fd85f958908187aa778d3609170dba50c247acaa187dad",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x15fa1659f2c1b6a0eec286f3871352ee9bbb618985b7c561e0b6d99e5b8eac0d",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g2v0.json
index 7a73a41bf..b26486af8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g2v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d11g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g2v0Filler.json",
+            "sourceHash" : "8741042f3f4f4a76f8baea68119933f5e2aa613d2fd09ae24ff09f87ab864c40"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf46b",
+                    "hash" : "0x257bec186aff3b6224248d94d6183bbde41c494fbe92097d781cc722723d93b2",
+                    "mixHash" : "0xa3c014c429ed05c6e5234bb84a909963b379a65b130200869f3b3b30d500cf93",
+                    "nonce" : "0x67797e1856225dfe",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x0d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81",
+                    "stateRoot" : "0xacc198f8c8e8cb28efa3b0dee0bbba8db1d91c4490b6ed45588eaa13150c0a69",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7e24421f0516e674c8b0158aa5249c6b3f422554dd813d82ff0757a91fbd6604",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acc198f8c8e8cb28efa3b0dee0bbba8db1d91c4490b6ed45588eaa13150c0a69a07e24421f0516e674c8b0158aa5249c6b3f422554dd813d82ff0757a91fbd6604a00d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f46b8203e880a0a3c014c429ed05c6e5234bb84a909963b379a65b130200869f3b3b30d500cf938867797e1856225dfef8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba0fa00e0ecea2c627b2fc75bf61cf6f016626137fb3ea2ab00b925a80d4e3ba6b5a075e2643871b62fb80e225b3f4a862322533fb442d60608b2ee71a23de3ed02f2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa00e0ecea2c627b2fc75bf61cf6f016626137fb3ea2ab00b925a80d4e3ba6b5",
+                        "s" : "0x75e2643871b62fb80e225b3f4a862322533fb442d60608b2ee71a23de3ed02f2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x257bec186aff3b6224248d94d6183bbde41c494fbe92097d781cc722723d93b2",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf46b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b95",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d11g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g2v0Filler.json",
+            "sourceHash" : "8741042f3f4f4a76f8baea68119933f5e2aa613d2fd09ae24ff09f87ab864c40"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x9c8276f9b07b9e8c3957f65731763d5b3da35fdcf846f96e8f476bfee4290244",
+                    "mixHash" : "0xfe647c959b1fe6a6123532bed742fc93fc5481ea3bba1d4d8075eaff2540e8a8",
+                    "nonce" : "0x077d60e8f237ef57",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7e24421f0516e674c8b0158aa5249c6b3f422554dd813d82ff0757a91fbd6604",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a07e24421f0516e674c8b0158aa5249c6b3f422554dd813d82ff0757a91fbd6604a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0fe647c959b1fe6a6123532bed742fc93fc5481ea3bba1d4d8075eaff2540e8a888077d60e8f237ef57f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba0fa00e0ecea2c627b2fc75bf61cf6f016626137fb3ea2ab00b925a80d4e3ba6b5a075e2643871b62fb80e225b3f4a862322533fb442d60608b2ee71a23de3ed02f2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa00e0ecea2c627b2fc75bf61cf6f016626137fb3ea2ab00b925a80d4e3ba6b5",
+                        "s" : "0x75e2643871b62fb80e225b3f4a862322533fb442d60608b2ee71a23de3ed02f2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9c8276f9b07b9e8c3957f65731763d5b3da35fdcf846f96e8f476bfee4290244",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d11g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g2v0Filler.json",
+            "sourceHash" : "8741042f3f4f4a76f8baea68119933f5e2aa613d2fd09ae24ff09f87ab864c40"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x9a9a46cc55ce541af5051d15936cf8cbe1306d186dfd074a177a17a8e30a5f1e",
+                    "mixHash" : "0xdf8bf93917f6668603bfca2b80c1f439e04b921923e88489f7ba0a208a80ea32",
+                    "nonce" : "0xabbdde4e1e55abcd",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7e24421f0516e674c8b0158aa5249c6b3f422554dd813d82ff0757a91fbd6604",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a07e24421f0516e674c8b0158aa5249c6b3f422554dd813d82ff0757a91fbd6604a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0df8bf93917f6668603bfca2b80c1f439e04b921923e88489f7ba0a208a80ea3288abbdde4e1e55abcdf8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba0fa00e0ecea2c627b2fc75bf61cf6f016626137fb3ea2ab00b925a80d4e3ba6b5a075e2643871b62fb80e225b3f4a862322533fb442d60608b2ee71a23de3ed02f2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa00e0ecea2c627b2fc75bf61cf6f016626137fb3ea2ab00b925a80d4e3ba6b5",
+                        "s" : "0x75e2643871b62fb80e225b3f4a862322533fb442d60608b2ee71a23de3ed02f2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9a9a46cc55ce541af5051d15936cf8cbe1306d186dfd074a177a17a8e30a5f1e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g3v0.json
index 7a73a41bf..41b9f66ea 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g3v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d11g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g3v0Filler.json",
+            "sourceHash" : "2fb0931cab8ad000eee2ebefd8f54b6fbb34ba3b44bfe1cc39e6b499161cbe67"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf46b",
+                    "hash" : "0xe9c3b88c6192e96a7ce6febe1997af57402ad748c64ebdd906b4baf297e7b267",
+                    "mixHash" : "0x9619007b71d9811f06ac6631f8b674fa7f476785d5641b8332212f59e8aaf2f5",
+                    "nonce" : "0x51b097ccefc08670",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x0d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81",
+                    "stateRoot" : "0xacc198f8c8e8cb28efa3b0dee0bbba8db1d91c4490b6ed45588eaa13150c0a69",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb84df68285cb91a8f2fc4ad4923250ed7554c34766177d4550078bd480bafd4c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acc198f8c8e8cb28efa3b0dee0bbba8db1d91c4490b6ed45588eaa13150c0a69a0b84df68285cb91a8f2fc4ad4923250ed7554c34766177d4550078bd480bafd4ca00d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f46b8203e880a09619007b71d9811f06ac6631f8b674fa7f476785d5641b8332212f59e8aaf2f58851b097ccefc08670f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ca01434e47abb38b397a31e1433fefb005a8e7b5685b23a6df565c97c1e5afe5d18a01ce3864fae76a70bce29c3ab7987bd5870e5a8914767956dad3f110d05fbc5e9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1434e47abb38b397a31e1433fefb005a8e7b5685b23a6df565c97c1e5afe5d18",
+                        "s" : "0x1ce3864fae76a70bce29c3ab7987bd5870e5a8914767956dad3f110d05fbc5e9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe9c3b88c6192e96a7ce6febe1997af57402ad748c64ebdd906b4baf297e7b267",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf46b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b95",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d11g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g3v0Filler.json",
+            "sourceHash" : "2fb0931cab8ad000eee2ebefd8f54b6fbb34ba3b44bfe1cc39e6b499161cbe67"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x60e0faeb8ad2d10b336e3b44fe0874f819abf83c3cfda47f65a1a6ee702a4138",
+                    "mixHash" : "0xc53ce35534a69050085ee2033e003968a916bd6cb5c6dc48c9416eef4917ebd9",
+                    "nonce" : "0xc3b14ebfd3cfe874",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb84df68285cb91a8f2fc4ad4923250ed7554c34766177d4550078bd480bafd4c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0b84df68285cb91a8f2fc4ad4923250ed7554c34766177d4550078bd480bafd4ca0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0c53ce35534a69050085ee2033e003968a916bd6cb5c6dc48c9416eef4917ebd988c3b14ebfd3cfe874f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ca01434e47abb38b397a31e1433fefb005a8e7b5685b23a6df565c97c1e5afe5d18a01ce3864fae76a70bce29c3ab7987bd5870e5a8914767956dad3f110d05fbc5e9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1434e47abb38b397a31e1433fefb005a8e7b5685b23a6df565c97c1e5afe5d18",
+                        "s" : "0x1ce3864fae76a70bce29c3ab7987bd5870e5a8914767956dad3f110d05fbc5e9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x60e0faeb8ad2d10b336e3b44fe0874f819abf83c3cfda47f65a1a6ee702a4138",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d11g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g3v0Filler.json",
+            "sourceHash" : "2fb0931cab8ad000eee2ebefd8f54b6fbb34ba3b44bfe1cc39e6b499161cbe67"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xb630f55831c2f432cb87eef2f35def46083b03c7a534c0f225c468736031258e",
+                    "mixHash" : "0x5dd432fb19a9a5707c14fe5783f38eefead89a267b7fb831f758f0d4e738a964",
+                    "nonce" : "0x8acb93950ee5d590",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb84df68285cb91a8f2fc4ad4923250ed7554c34766177d4550078bd480bafd4c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0b84df68285cb91a8f2fc4ad4923250ed7554c34766177d4550078bd480bafd4ca0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a05dd432fb19a9a5707c14fe5783f38eefead89a267b7fb831f758f0d4e738a964888acb93950ee5d590f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ca01434e47abb38b397a31e1433fefb005a8e7b5685b23a6df565c97c1e5afe5d18a01ce3864fae76a70bce29c3ab7987bd5870e5a8914767956dad3f110d05fbc5e9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1434e47abb38b397a31e1433fefb005a8e7b5685b23a6df565c97c1e5afe5d18",
+                        "s" : "0x1ce3864fae76a70bce29c3ab7987bd5870e5a8914767956dad3f110d05fbc5e9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb630f55831c2f432cb87eef2f35def46083b03c7a534c0f225c468736031258e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g0v0.json
index 2beece87b..f091c8311 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d12g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g0v0Filler.json",
             "sourceHash" : "209c64074e50b4c7289cb76de2e3b1a1c8cbac1b51108b7ca7655286e1950b20"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0x66354987e4961de0da1933abf2347ad25ca69059aefce443d43da93a1d8bf780",
-                    "mixHash" : "0x93ccb86a0133a7ab29d90f25647c64f72efb8f5232a303e5f90d4f16609b6e49",
-                    "nonce" : "0x871844a0e8992c61",
+                    "hash" : "0x372823b728620e261169750ac59df6bd2c4f34c42680021f5d66b2266292af73",
+                    "mixHash" : "0x6616ca96edcee85265cdda8a5305bf54268df0bae679002525fb19b2329be0d3",
+                    "nonce" : "0x169a2414e80bd7d3",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x2307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a093ccb86a0133a7ab29d90f25647c64f72efb8f5232a303e5f90d4f16609b6e4988871844a0e8992c61f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a06616ca96edcee85265cdda8a5305bf54268df0bae679002525fb19b2329be0d388169a2414e80bd7d3f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x66354987e4961de0da1933abf2347ad25ca69059aefce443d43da93a1d8bf780",
+        "lastblockhash" : "0x372823b728620e261169750ac59df6bd2c4f34c42680021f5d66b2266292af73",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d12g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g0v0Filler.json",
             "sourceHash" : "209c64074e50b4c7289cb76de2e3b1a1c8cbac1b51108b7ca7655286e1950b20"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0x1cc9f51badd28697ac2dd3a1f4db73995c0f4ca14c79dd0146e08d1f2dc6b28b",
-                    "mixHash" : "0x3c487652d24e5e619ce66c510d331050e53850f62a5234340e66f5e5ac9b2a0c",
-                    "nonce" : "0x36724229852665a6",
+                    "hash" : "0x1dcb28539d688b1544d9c3593d142d3b4f66749b22e084ede9ad593668cb6200",
+                    "mixHash" : "0xf44a9745d5e81eae4b8441acbb0b28d6088772b4b1296e7e162d5cb1caa8c91b",
+                    "nonce" : "0x8ea7ef316bc160c7",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0x2307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a03c487652d24e5e619ce66c510d331050e53850f62a5234340e66f5e5ac9b2a0c8836724229852665a6f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0f44a9745d5e81eae4b8441acbb0b28d6088772b4b1296e7e162d5cb1caa8c91b888ea7ef316bc160c7f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1cc9f51badd28697ac2dd3a1f4db73995c0f4ca14c79dd0146e08d1f2dc6b28b",
+        "lastblockhash" : "0x1dcb28539d688b1544d9c3593d142d3b4f66749b22e084ede9ad593668cb6200",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d12g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g0v0Filler.json",
             "sourceHash" : "209c64074e50b4c7289cb76de2e3b1a1c8cbac1b51108b7ca7655286e1950b20"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0xc22d62f18d6b6142b8065349002325623e1a0f30ba4ab4227412d8f5274a4518",
-                    "mixHash" : "0x92f7c6aa718828aa787a0cb2875c59252057b98d903ab4c5f062021455c1fba2",
-                    "nonce" : "0x56d4d007cfeab259",
+                    "hash" : "0x45a9880a4a2309066eeec476ac1bad3da41cf464a77cd8f4052c0437b35a1a52",
+                    "mixHash" : "0x6afd9146d3a535ffbe2a22d612fff0b9c064d92eca03bc826750b4ddc538ff07",
+                    "nonce" : "0xb657e0c68e001552",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0x2307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a092f7c6aa718828aa787a0cb2875c59252057b98d903ab4c5f062021455c1fba28856d4d007cfeab259f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a06afd9146d3a535ffbe2a22d612fff0b9c064d92eca03bc826750b4ddc538ff0788b657e0c68e001552f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc22d62f18d6b6142b8065349002325623e1a0f30ba4ab4227412d8f5274a4518",
+        "lastblockhash" : "0x45a9880a4a2309066eeec476ac1bad3da41cf464a77cd8f4052c0437b35a1a52",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g1v0.json
index 7a73a41bf..286511fd0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d12g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g1v0Filler.json",
+            "sourceHash" : "752efc62d61655d22c2d24a6476ffc08c61c1c9471d3f30e3a87e90365651521"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xfb7320b2ddb7ea42aa94adbb2603bf88307ab81c7220c8dcbde2d7c368e98482",
+                    "mixHash" : "0x8e49646e865a1695df37e095f1da7aa5dd76e5a6e68162042a893fde5eca77b9",
+                    "nonce" : "0xc60c6395a0220fd4",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0xf3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9570f214ff2a14f37aa3b97c574a4f1b666b68e649f6806014c62f95824269e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa0a9570f214ff2a14f37aa3b97c574a4f1b666b68e649f6806014c62f95824269ea052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a08e49646e865a1695df37e095f1da7aa5dd76e5a6e68162042a893fde5eca77b988c60c6395a0220fd4f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba08ee259676b7cdb6aee12f98f8292c0a72ad56a5f6639f578fb60e0ba5ad5aa01a040d879c606af7fa69c6ffc42798b959db0a324655339db82e93728e69ebc2a88c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ee259676b7cdb6aee12f98f8292c0a72ad56a5f6639f578fb60e0ba5ad5aa01",
+                        "s" : "0x40d879c606af7fa69c6ffc42798b959db0a324655339db82e93728e69ebc2a88",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfb7320b2ddb7ea42aa94adbb2603bf88307ab81c7220c8dcbde2d7c368e98482",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d12g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g1v0Filler.json",
+            "sourceHash" : "752efc62d61655d22c2d24a6476ffc08c61c1c9471d3f30e3a87e90365651521"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x5f1f837941459e40b3f7dd91d783852e19d5c837c7fd7a697ad439fbdf1bbf40",
+                    "mixHash" : "0x155c0eaf9970aeed5a02f538974b6db2820fa485e7a151628b800d86f052e9c5",
+                    "nonce" : "0x0c7cdfbbbe9fba6f",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9570f214ff2a14f37aa3b97c574a4f1b666b68e649f6806014c62f95824269e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0a9570f214ff2a14f37aa3b97c574a4f1b666b68e649f6806014c62f95824269ea0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0155c0eaf9970aeed5a02f538974b6db2820fa485e7a151628b800d86f052e9c5880c7cdfbbbe9fba6ff8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba08ee259676b7cdb6aee12f98f8292c0a72ad56a5f6639f578fb60e0ba5ad5aa01a040d879c606af7fa69c6ffc42798b959db0a324655339db82e93728e69ebc2a88c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ee259676b7cdb6aee12f98f8292c0a72ad56a5f6639f578fb60e0ba5ad5aa01",
+                        "s" : "0x40d879c606af7fa69c6ffc42798b959db0a324655339db82e93728e69ebc2a88",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5f1f837941459e40b3f7dd91d783852e19d5c837c7fd7a697ad439fbdf1bbf40",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d12g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g1v0Filler.json",
+            "sourceHash" : "752efc62d61655d22c2d24a6476ffc08c61c1c9471d3f30e3a87e90365651521"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x6a0f8e6bd29d7fdd592784303fbde9e86fec1fe7ae223af36c2357c3ae42a235",
+                    "mixHash" : "0xad462baacc6436a7bf660158dc76d8f45c7c20870c065eb1d283cc6983603bfa",
+                    "nonce" : "0x667aea852850cf65",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9570f214ff2a14f37aa3b97c574a4f1b666b68e649f6806014c62f95824269e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0a9570f214ff2a14f37aa3b97c574a4f1b666b68e649f6806014c62f95824269ea0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0ad462baacc6436a7bf660158dc76d8f45c7c20870c065eb1d283cc6983603bfa88667aea852850cf65f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba08ee259676b7cdb6aee12f98f8292c0a72ad56a5f6639f578fb60e0ba5ad5aa01a040d879c606af7fa69c6ffc42798b959db0a324655339db82e93728e69ebc2a88c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ee259676b7cdb6aee12f98f8292c0a72ad56a5f6639f578fb60e0ba5ad5aa01",
+                        "s" : "0x40d879c606af7fa69c6ffc42798b959db0a324655339db82e93728e69ebc2a88",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6a0f8e6bd29d7fdd592784303fbde9e86fec1fe7ae223af36c2357c3ae42a235",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g2v0.json
index 7a73a41bf..a59b4b0ba 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d12g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g2v0Filler.json",
+            "sourceHash" : "208c6d5757d59438a1ced782fb0e5543060680e558412a6d2c4941351e8b23ad"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x25cb15e93df806710f599409a4d04fe43cf45d5e850a48bd8c0dd162644327a8",
+                    "mixHash" : "0x18f764f0d6a0846e967efd0ea84c551b181a0fb354bc902ee28551aadd84b817",
+                    "nonce" : "0xac379efe1803c09c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0xf3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa4de65749b3dc2bbb75bcfa8e49521d16f85b5e3e8d1a24469278dbb9efbee1d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa0a4de65749b3dc2bbb75bcfa8e49521d16f85b5e3e8d1a24469278dbb9efbee1da052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a018f764f0d6a0846e967efd0ea84c551b181a0fb354bc902ee28551aadd84b81788ac379efe1803c09cf8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ca0036a6b050dd184a908eb93a39dcdb4ff09e053d0ff92fba001df220447288b1fa05941a9d341983da9e7057073a0f7f5154eadabc69a995b9f2a72ef39d9111b44c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x036a6b050dd184a908eb93a39dcdb4ff09e053d0ff92fba001df220447288b1f",
+                        "s" : "0x5941a9d341983da9e7057073a0f7f5154eadabc69a995b9f2a72ef39d9111b44",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x25cb15e93df806710f599409a4d04fe43cf45d5e850a48bd8c0dd162644327a8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d12g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g2v0Filler.json",
+            "sourceHash" : "208c6d5757d59438a1ced782fb0e5543060680e558412a6d2c4941351e8b23ad"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x83ae1a24f729aa9aff51fb66a422607982c0614c7c9507e961bdb6b0bb2b17f8",
+                    "mixHash" : "0x066f967d6be13ec3ba979c34e74d73c5e9509a88e2702ee255e8e2a8967b06e3",
+                    "nonce" : "0xdfca09a7f77fc755",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa4de65749b3dc2bbb75bcfa8e49521d16f85b5e3e8d1a24469278dbb9efbee1d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0a4de65749b3dc2bbb75bcfa8e49521d16f85b5e3e8d1a24469278dbb9efbee1da0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0066f967d6be13ec3ba979c34e74d73c5e9509a88e2702ee255e8e2a8967b06e388dfca09a7f77fc755f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ca0036a6b050dd184a908eb93a39dcdb4ff09e053d0ff92fba001df220447288b1fa05941a9d341983da9e7057073a0f7f5154eadabc69a995b9f2a72ef39d9111b44c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x036a6b050dd184a908eb93a39dcdb4ff09e053d0ff92fba001df220447288b1f",
+                        "s" : "0x5941a9d341983da9e7057073a0f7f5154eadabc69a995b9f2a72ef39d9111b44",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x83ae1a24f729aa9aff51fb66a422607982c0614c7c9507e961bdb6b0bb2b17f8",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d12g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g2v0Filler.json",
+            "sourceHash" : "208c6d5757d59438a1ced782fb0e5543060680e558412a6d2c4941351e8b23ad"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xe91474ce631bc65342b40212af87fbe5078d0bc63e4b53c5a3e50f2d19b8abfd",
+                    "mixHash" : "0x597a0826043b77b3f4a140436f8f68a3c024c181955c320c80e93ebcf8836e87",
+                    "nonce" : "0xc880a3f192c7b641",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa4de65749b3dc2bbb75bcfa8e49521d16f85b5e3e8d1a24469278dbb9efbee1d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0a4de65749b3dc2bbb75bcfa8e49521d16f85b5e3e8d1a24469278dbb9efbee1da0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0597a0826043b77b3f4a140436f8f68a3c024c181955c320c80e93ebcf8836e8788c880a3f192c7b641f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ca0036a6b050dd184a908eb93a39dcdb4ff09e053d0ff92fba001df220447288b1fa05941a9d341983da9e7057073a0f7f5154eadabc69a995b9f2a72ef39d9111b44c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x036a6b050dd184a908eb93a39dcdb4ff09e053d0ff92fba001df220447288b1f",
+                        "s" : "0x5941a9d341983da9e7057073a0f7f5154eadabc69a995b9f2a72ef39d9111b44",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe91474ce631bc65342b40212af87fbe5078d0bc63e4b53c5a3e50f2d19b8abfd",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g3v0.json
index 7a73a41bf..90aa7dd74 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d12g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g3v0Filler.json",
+            "sourceHash" : "72b9f21d53a0aaefbc82fb87a86e932fc2ec9654a30a4357d2c10fe8b681e0d8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xe761aec172d37d00c796ca8ba8125722e369a89f490ad6e8db40a2e5224f6ac2",
+                    "mixHash" : "0xf9f7f65c162bfb9d640df42c995f8cd79ddacd92749c0d89290d5e02df71cc45",
+                    "nonce" : "0xfcca56637ff58359",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0xf3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbb9002711a476673841ec55e5237a5625a80749b5bdbadba621dffdcf5fadf26",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa0bb9002711a476673841ec55e5237a5625a80749b5bdbadba621dffdcf5fadf26a052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0f9f7f65c162bfb9d640df42c995f8cd79ddacd92749c0d89290d5e02df71cc4588fcca56637ff58359f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba01c970b4d753de0ff42c4ae644c80fa39fd658cc3ae4bf3f315388fe12716be5fa076f2b86622b1b8f82e02861c6efeb9dd4bb15f08911c467b1f141aa2802d8b03c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1c970b4d753de0ff42c4ae644c80fa39fd658cc3ae4bf3f315388fe12716be5f",
+                        "s" : "0x76f2b86622b1b8f82e02861c6efeb9dd4bb15f08911c467b1f141aa2802d8b03",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe761aec172d37d00c796ca8ba8125722e369a89f490ad6e8db40a2e5224f6ac2",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d12g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g3v0Filler.json",
+            "sourceHash" : "72b9f21d53a0aaefbc82fb87a86e932fc2ec9654a30a4357d2c10fe8b681e0d8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x72360101a4631525b397151a16303915fff7d0b28ddf6d741515be40b1c9a0bf",
+                    "mixHash" : "0xdd692997664d14a1bfc02697ff96af9d68b6d0c5444763ee51e91492a1c0ac9c",
+                    "nonce" : "0x4ff4897ecb6fb90c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbb9002711a476673841ec55e5237a5625a80749b5bdbadba621dffdcf5fadf26",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0bb9002711a476673841ec55e5237a5625a80749b5bdbadba621dffdcf5fadf26a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0dd692997664d14a1bfc02697ff96af9d68b6d0c5444763ee51e91492a1c0ac9c884ff4897ecb6fb90cf8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba01c970b4d753de0ff42c4ae644c80fa39fd658cc3ae4bf3f315388fe12716be5fa076f2b86622b1b8f82e02861c6efeb9dd4bb15f08911c467b1f141aa2802d8b03c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1c970b4d753de0ff42c4ae644c80fa39fd658cc3ae4bf3f315388fe12716be5f",
+                        "s" : "0x76f2b86622b1b8f82e02861c6efeb9dd4bb15f08911c467b1f141aa2802d8b03",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x72360101a4631525b397151a16303915fff7d0b28ddf6d741515be40b1c9a0bf",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d12g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g3v0Filler.json",
+            "sourceHash" : "72b9f21d53a0aaefbc82fb87a86e932fc2ec9654a30a4357d2c10fe8b681e0d8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xd99a8d746fd3ea63e23276ee78dfdb02e95a14427659594d24065d4943a8c4d7",
+                    "mixHash" : "0x2a393d7bd3901483ffec08fa1c8ebf6441b1927da47367d8985213771b1fe605",
+                    "nonce" : "0xda284c55d821e2b4",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbb9002711a476673841ec55e5237a5625a80749b5bdbadba621dffdcf5fadf26",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0bb9002711a476673841ec55e5237a5625a80749b5bdbadba621dffdcf5fadf26a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a02a393d7bd3901483ffec08fa1c8ebf6441b1927da47367d8985213771b1fe60588da284c55d821e2b4f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba01c970b4d753de0ff42c4ae644c80fa39fd658cc3ae4bf3f315388fe12716be5fa076f2b86622b1b8f82e02861c6efeb9dd4bb15f08911c467b1f141aa2802d8b03c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1c970b4d753de0ff42c4ae644c80fa39fd658cc3ae4bf3f315388fe12716be5f",
+                        "s" : "0x76f2b86622b1b8f82e02861c6efeb9dd4bb15f08911c467b1f141aa2802d8b03",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd99a8d746fd3ea63e23276ee78dfdb02e95a14427659594d24065d4943a8c4d7",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g0v0.json
index b29be0349..a25b47799 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d13g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g0v0Filler.json",
             "sourceHash" : "ca58ade90fe21a99d4c616fda73a093db6e0a455fc63973b5e4c143ef48e9a7b"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0x42ba898427b3f9777c403b8ca49dbd088e366f61745024aa07b882a67643fcfc",
-                    "mixHash" : "0xd8d7854de915b2587ce49b1de66a585b3b100fae81e1796d0894d8b127489a0f",
-                    "nonce" : "0x58a0b05d910cb1d6",
+                    "hash" : "0xcbbce8949009f4aa197ea1795b775c4f453e36eec90250333d7eeafdc4d52220",
+                    "mixHash" : "0xac6b9793a1c2497f4dbf639c4a6699d89eb688e469f76b4faa7206bd59b19a51",
+                    "nonce" : "0x6426caa0d23b7415",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x50e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0d8d7854de915b2587ce49b1de66a585b3b100fae81e1796d0894d8b127489a0f8858a0b05d910cb1d6f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0ac6b9793a1c2497f4dbf639c4a6699d89eb688e469f76b4faa7206bd59b19a51886426caa0d23b7415f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x42ba898427b3f9777c403b8ca49dbd088e366f61745024aa07b882a67643fcfc",
+        "lastblockhash" : "0xcbbce8949009f4aa197ea1795b775c4f453e36eec90250333d7eeafdc4d52220",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d13g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g0v0Filler.json",
             "sourceHash" : "ca58ade90fe21a99d4c616fda73a093db6e0a455fc63973b5e4c143ef48e9a7b"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0x1b3c0fc03fc32b4d799b2820624600bec9cc9f0931c47292e49db10ae8fbdf86",
-                    "mixHash" : "0xfe5f16a1b002aecd1a1a5023d06bfd029e3be2e98c239a6069e42d8596dd00ad",
-                    "nonce" : "0x00431d104364b677",
+                    "hash" : "0x51028edbe232be9a5379e5e46ca2fbdfc840b79eeeba0a01a8da3233c0d7011a",
+                    "mixHash" : "0x0747c2a6d9f34f64bc8319fcf07a04356f429e2336dd172a57d71d64ba78f988",
+                    "nonce" : "0x5409928b2adca657",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0x50e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0fe5f16a1b002aecd1a1a5023d06bfd029e3be2e98c239a6069e42d8596dd00ad8800431d104364b677f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a00747c2a6d9f34f64bc8319fcf07a04356f429e2336dd172a57d71d64ba78f988885409928b2adca657f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1b3c0fc03fc32b4d799b2820624600bec9cc9f0931c47292e49db10ae8fbdf86",
+        "lastblockhash" : "0x51028edbe232be9a5379e5e46ca2fbdfc840b79eeeba0a01a8da3233c0d7011a",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d13g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g0v0Filler.json",
             "sourceHash" : "ca58ade90fe21a99d4c616fda73a093db6e0a455fc63973b5e4c143ef48e9a7b"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0xcef0eb47c31bc94876db24749e30e8575f8b6a259255d44653335c948377b7f1",
-                    "mixHash" : "0xa13bf65fc0f57f5f596e2ad5d3dbc740be66917a8766b6539d338f3f6c3f7975",
-                    "nonce" : "0xb61de0b74cac1a69",
+                    "hash" : "0xcc488a9a91a32d29ceea4759548481eb4dc627f6cd897552cca183117bd64c87",
+                    "mixHash" : "0xa18aef7ff1bd412fe0aa0f3b54aa6ea6b1bbbdd9750c51d1879493efde5b0a60",
+                    "nonce" : "0x66acae94fadc7b13",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0x50e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0a13bf65fc0f57f5f596e2ad5d3dbc740be66917a8766b6539d338f3f6c3f797588b61de0b74cac1a69f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0a18aef7ff1bd412fe0aa0f3b54aa6ea6b1bbbdd9750c51d1879493efde5b0a608866acae94fadc7b13f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcef0eb47c31bc94876db24749e30e8575f8b6a259255d44653335c948377b7f1",
+        "lastblockhash" : "0xcc488a9a91a32d29ceea4759548481eb4dc627f6cd897552cca183117bd64c87",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g1v0.json
index 7a73a41bf..b6098f0e1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d13g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g1v0Filler.json",
+            "sourceHash" : "17531571d6e1d2039b32604c0d85669c1cc2afb2aadb6471ccb25ae3664aa652"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x29c095583ed3060b6221bbebbf7bebf7c8d52dfd4f1d5f9d4143ca413532b268",
+                    "mixHash" : "0x833e562bdf3d00079fc7933e363c8b96bd13a22faa001563e5ab836ab96bb4fc",
+                    "nonce" : "0x2e0721fa0f8c17be",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x4a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9e140ccf77cd783b96d5b763cd153baa083655e2552d0c4a194ff00e5e554534",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a09e140ccf77cd783b96d5b763cd153baa083655e2552d0c4a194ff00e5e554534a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0833e562bdf3d00079fc7933e363c8b96bd13a22faa001563e5ab836ab96bb4fc882e0721fa0f8c17bef8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ba0f81e1fb33bcb808b9b57591434955af1db3699298282685c29f605c9c2161ca6a0477c55de99e70fb4f296573188dbd388cfa19cb767d45885484dd13dec1e2724c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf81e1fb33bcb808b9b57591434955af1db3699298282685c29f605c9c2161ca6",
+                        "s" : "0x477c55de99e70fb4f296573188dbd388cfa19cb767d45885484dd13dec1e2724",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x29c095583ed3060b6221bbebbf7bebf7c8d52dfd4f1d5f9d4143ca413532b268",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d13g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g1v0Filler.json",
+            "sourceHash" : "17531571d6e1d2039b32604c0d85669c1cc2afb2aadb6471ccb25ae3664aa652"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x4386214247914103b2fb6770cc2427d81c09b3497a59dcb0c00a9d4f5115f296",
+                    "mixHash" : "0x2a4f2a811e6985228dc08933b671e954459904006a448dd37129344c3477f93e",
+                    "nonce" : "0xe0a8c40455e2fe8c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9e140ccf77cd783b96d5b763cd153baa083655e2552d0c4a194ff00e5e554534",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea09e140ccf77cd783b96d5b763cd153baa083655e2552d0c4a194ff00e5e554534a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a02a4f2a811e6985228dc08933b671e954459904006a448dd37129344c3477f93e88e0a8c40455e2fe8cf8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ba0f81e1fb33bcb808b9b57591434955af1db3699298282685c29f605c9c2161ca6a0477c55de99e70fb4f296573188dbd388cfa19cb767d45885484dd13dec1e2724c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf81e1fb33bcb808b9b57591434955af1db3699298282685c29f605c9c2161ca6",
+                        "s" : "0x477c55de99e70fb4f296573188dbd388cfa19cb767d45885484dd13dec1e2724",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4386214247914103b2fb6770cc2427d81c09b3497a59dcb0c00a9d4f5115f296",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d13g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g1v0Filler.json",
+            "sourceHash" : "17531571d6e1d2039b32604c0d85669c1cc2afb2aadb6471ccb25ae3664aa652"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x68457f34dda6fedc15cf0f4d708ace9f39c699d616f60c83d4bcafeb4ea0c058",
+                    "mixHash" : "0x0fb18086de28aab87dfdbbfb0d8b113463c7c60afe9db63b7277e3391bc5ad3f",
+                    "nonce" : "0xfc154cbca51f0ddb",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9e140ccf77cd783b96d5b763cd153baa083655e2552d0c4a194ff00e5e554534",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea09e140ccf77cd783b96d5b763cd153baa083655e2552d0c4a194ff00e5e554534a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a00fb18086de28aab87dfdbbfb0d8b113463c7c60afe9db63b7277e3391bc5ad3f88fc154cbca51f0ddbf8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ba0f81e1fb33bcb808b9b57591434955af1db3699298282685c29f605c9c2161ca6a0477c55de99e70fb4f296573188dbd388cfa19cb767d45885484dd13dec1e2724c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf81e1fb33bcb808b9b57591434955af1db3699298282685c29f605c9c2161ca6",
+                        "s" : "0x477c55de99e70fb4f296573188dbd388cfa19cb767d45885484dd13dec1e2724",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x68457f34dda6fedc15cf0f4d708ace9f39c699d616f60c83d4bcafeb4ea0c058",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g2v0.json
index 7a73a41bf..73da1aa04 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d13g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g2v0Filler.json",
+            "sourceHash" : "d9cd7b57432178636c905f5002478a290467ecb941d0a5baac3522d3167f73f1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x679db9c13e70bf56f12582851a2581731284a058a9c75780b9ee78282a7d3f72",
+                    "mixHash" : "0x77d2844de8a7d23ec5fac1f6cea7db31e0770cb7b8e4f4d5e89d7f41e4b47df7",
+                    "nonce" : "0xef88c236f80c19e2",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x4a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf60e6fa15b2ba7373fe5f3f30b29053d3d84cd51f533a22a7af0da718cb140d3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a0f60e6fa15b2ba7373fe5f3f30b29053d3d84cd51f533a22a7af0da718cb140d3a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a077d2844de8a7d23ec5fac1f6cea7db31e0770cb7b8e4f4d5e89d7f41e4b47df788ef88c236f80c19e2f8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ba02d8dcf7048f1614f795503732f8b48fb924c02d80fec98b362a1757f642a8729a0105bbff57a0588d9cbdc7b032981fa35e17a8c4ab5dbae7af94b41d36a0d37b2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d8dcf7048f1614f795503732f8b48fb924c02d80fec98b362a1757f642a8729",
+                        "s" : "0x105bbff57a0588d9cbdc7b032981fa35e17a8c4ab5dbae7af94b41d36a0d37b2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x679db9c13e70bf56f12582851a2581731284a058a9c75780b9ee78282a7d3f72",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d13g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g2v0Filler.json",
+            "sourceHash" : "d9cd7b57432178636c905f5002478a290467ecb941d0a5baac3522d3167f73f1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xe4168ea84bd54190e8f9be5823b5dea4e6780f694f90d5e94fd8c1bae51a8417",
+                    "mixHash" : "0x5034ece97a5f2d4b95d33b4cb8265ccb44651aeae05ed8793b5c1e6547a68270",
+                    "nonce" : "0x5a53af7d21b8281e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf60e6fa15b2ba7373fe5f3f30b29053d3d84cd51f533a22a7af0da718cb140d3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea0f60e6fa15b2ba7373fe5f3f30b29053d3d84cd51f533a22a7af0da718cb140d3a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a05034ece97a5f2d4b95d33b4cb8265ccb44651aeae05ed8793b5c1e6547a68270885a53af7d21b8281ef8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ba02d8dcf7048f1614f795503732f8b48fb924c02d80fec98b362a1757f642a8729a0105bbff57a0588d9cbdc7b032981fa35e17a8c4ab5dbae7af94b41d36a0d37b2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d8dcf7048f1614f795503732f8b48fb924c02d80fec98b362a1757f642a8729",
+                        "s" : "0x105bbff57a0588d9cbdc7b032981fa35e17a8c4ab5dbae7af94b41d36a0d37b2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe4168ea84bd54190e8f9be5823b5dea4e6780f694f90d5e94fd8c1bae51a8417",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d13g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g2v0Filler.json",
+            "sourceHash" : "d9cd7b57432178636c905f5002478a290467ecb941d0a5baac3522d3167f73f1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xadb273d6ae7779b6d89fcf4775183c22384f81d1cf4796c3c84a17a442a176ee",
+                    "mixHash" : "0xb33ed799ee8898581cc4b1e0d0202f9d6a3c88b145d29cbdd61d962ce2db4416",
+                    "nonce" : "0xad556a37aab93f82",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf60e6fa15b2ba7373fe5f3f30b29053d3d84cd51f533a22a7af0da718cb140d3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea0f60e6fa15b2ba7373fe5f3f30b29053d3d84cd51f533a22a7af0da718cb140d3a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0b33ed799ee8898581cc4b1e0d0202f9d6a3c88b145d29cbdd61d962ce2db441688ad556a37aab93f82f8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ba02d8dcf7048f1614f795503732f8b48fb924c02d80fec98b362a1757f642a8729a0105bbff57a0588d9cbdc7b032981fa35e17a8c4ab5dbae7af94b41d36a0d37b2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d8dcf7048f1614f795503732f8b48fb924c02d80fec98b362a1757f642a8729",
+                        "s" : "0x105bbff57a0588d9cbdc7b032981fa35e17a8c4ab5dbae7af94b41d36a0d37b2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xadb273d6ae7779b6d89fcf4775183c22384f81d1cf4796c3c84a17a442a176ee",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g3v0.json
index 7a73a41bf..c5b73c6ee 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d13g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g3v0Filler.json",
+            "sourceHash" : "0e65e9773938e788722457ab7bf946ecc4a75e5e7c4bcdabe3e58478b80e6da3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x5ce412de24525c80c148a6a3c368bf62c0abc0311db4d3d39150ca079fece2aa",
+                    "mixHash" : "0x30bfb0bb0c22069ad52ec3612dc765e1428cc191b0a22494a36371d4ad10f4e3",
+                    "nonce" : "0xac2228bed70a681b",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x4a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe468f84c605b046c41e638bacc2906201449e87f05730bd90d5e30a97be26d56",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a0e468f84c605b046c41e638bacc2906201449e87f05730bd90d5e30a97be26d56a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a030bfb0bb0c22069ad52ec3612dc765e1428cc191b0a22494a36371d4ad10f4e388ac2228bed70a681bf8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c2157d9a52936da97011acfd541827725ba96963d460aa118dcd20a5a3118508a068035120f96bd72dd5001bc7f2fa91aa455a4fb63f923a7bd8e9e6139ba2f498c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc2157d9a52936da97011acfd541827725ba96963d460aa118dcd20a5a3118508",
+                        "s" : "0x68035120f96bd72dd5001bc7f2fa91aa455a4fb63f923a7bd8e9e6139ba2f498",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5ce412de24525c80c148a6a3c368bf62c0abc0311db4d3d39150ca079fece2aa",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d13g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g3v0Filler.json",
+            "sourceHash" : "0e65e9773938e788722457ab7bf946ecc4a75e5e7c4bcdabe3e58478b80e6da3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x0cf08262baf74f71b1853c871d456e30dcc6c06226fdea3f80be0ddf8c9d43fb",
+                    "mixHash" : "0xc3722880f48e400de378b157617fe1f5ab77d4858d782bad6f60b879e2615f38",
+                    "nonce" : "0x18eefcef06bb7fae",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe468f84c605b046c41e638bacc2906201449e87f05730bd90d5e30a97be26d56",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea0e468f84c605b046c41e638bacc2906201449e87f05730bd90d5e30a97be26d56a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0c3722880f48e400de378b157617fe1f5ab77d4858d782bad6f60b879e2615f388818eefcef06bb7faef8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c2157d9a52936da97011acfd541827725ba96963d460aa118dcd20a5a3118508a068035120f96bd72dd5001bc7f2fa91aa455a4fb63f923a7bd8e9e6139ba2f498c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc2157d9a52936da97011acfd541827725ba96963d460aa118dcd20a5a3118508",
+                        "s" : "0x68035120f96bd72dd5001bc7f2fa91aa455a4fb63f923a7bd8e9e6139ba2f498",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0cf08262baf74f71b1853c871d456e30dcc6c06226fdea3f80be0ddf8c9d43fb",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d13g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g3v0Filler.json",
+            "sourceHash" : "0e65e9773938e788722457ab7bf946ecc4a75e5e7c4bcdabe3e58478b80e6da3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x9de31a772650e96c51c22ed64d4e4eb901b12aa99c4cd7d6189df4f55b6151f3",
+                    "mixHash" : "0xe85e160e01e1084808b0ba1875fdb1638c273fd9337f95891fe34129b105eb25",
+                    "nonce" : "0xb155c6d64cba4f1d",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe468f84c605b046c41e638bacc2906201449e87f05730bd90d5e30a97be26d56",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea0e468f84c605b046c41e638bacc2906201449e87f05730bd90d5e30a97be26d56a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0e85e160e01e1084808b0ba1875fdb1638c273fd9337f95891fe34129b105eb2588b155c6d64cba4f1df8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c2157d9a52936da97011acfd541827725ba96963d460aa118dcd20a5a3118508a068035120f96bd72dd5001bc7f2fa91aa455a4fb63f923a7bd8e9e6139ba2f498c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc2157d9a52936da97011acfd541827725ba96963d460aa118dcd20a5a3118508",
+                        "s" : "0x68035120f96bd72dd5001bc7f2fa91aa455a4fb63f923a7bd8e9e6139ba2f498",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9de31a772650e96c51c22ed64d4e4eb901b12aa99c4cd7d6189df4f55b6151f3",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g0v0.json
index b064d9434..45815cf8d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d14g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g0v0Filler.json",
             "sourceHash" : "6c465800c33fa9cdf02394c2b7f1412dde6244fca0d75c1fba7efaefae9f2d26"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf427",
-                    "hash" : "0x7baa4b3f6bb7a43ddd4c66c1d5b48260b10d70837c65e22b97b30370e21a036c",
-                    "mixHash" : "0xfef257456c58f10067c78b1f7452091fe65e94b0f73ed41fc3bab5b26f663102",
-                    "nonce" : "0xff578f80d15fba88",
+                    "hash" : "0x68adfa86aec00c208e4c42f7eb95bb6fb0852da3080b98d7117fc3bd2cd3f5e7",
+                    "mixHash" : "0x4080e2831fed4a4e6d3c439c6be0bee8766bbd7de8f41381c9b5d2675500520c",
+                    "nonce" : "0xfa1d2a9baeb8b2b6",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x1d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44a",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x39bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0becb9eb7ce280ee90858a2f58cc0847f4e84b0732c738d0e30d554011e467e5ea039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a01d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4278203e880a0fef257456c58f10067c78b1f7452091fe65e94b0f73ed41fc3bab5b26f66310288ff578f80d15fba88f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0becb9eb7ce280ee90858a2f58cc0847f4e84b0732c738d0e30d554011e467e5ea039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a01d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4278203e880a04080e2831fed4a4e6d3c439c6be0bee8766bbd7de8f41381c9b5d2675500520c88fa1d2a9baeb8b2b6f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7baa4b3f6bb7a43ddd4c66c1d5b48260b10d70837c65e22b97b30370e21a036c",
+        "lastblockhash" : "0x68adfa86aec00c208e4c42f7eb95bb6fb0852da3080b98d7117fc3bd2cd3f5e7",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d14g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g0v0Filler.json",
             "sourceHash" : "6c465800c33fa9cdf02394c2b7f1412dde6244fca0d75c1fba7efaefae9f2d26"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0x8bcea8c1ea9009216e7009308276d3b54fc22804cba626af66bb6aed56b02011",
-                    "mixHash" : "0x260b3ee1291a202d697ba4e7407844e984cbe48b23dbf11d2d090502e6e63ec7",
-                    "nonce" : "0x28a442d4130e98bf",
+                    "hash" : "0xcaeca9a8bdd59d9d88392ac1b5d0d0d54664973c1449e23ba820214c72262808",
+                    "mixHash" : "0xcd4ce878e1bae07c63f477e12778dbbf16851e668c41a58e6d470053aa4ab370",
+                    "nonce" : "0x12455879c944139e",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0x39bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0260b3ee1291a202d697ba4e7407844e984cbe48b23dbf11d2d090502e6e63ec78828a442d4130e98bff8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0cd4ce878e1bae07c63f477e12778dbbf16851e668c41a58e6d470053aa4ab3708812455879c944139ef8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8bcea8c1ea9009216e7009308276d3b54fc22804cba626af66bb6aed56b02011",
+        "lastblockhash" : "0xcaeca9a8bdd59d9d88392ac1b5d0d0d54664973c1449e23ba820214c72262808",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d14g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g0v0Filler.json",
             "sourceHash" : "6c465800c33fa9cdf02394c2b7f1412dde6244fca0d75c1fba7efaefae9f2d26"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0x2c734c2ed74a035bcb3656c23799026a99b0d7f182aa527f252ba81a226cd825",
-                    "mixHash" : "0x8001fb43893a543cf350175bed7f5d246ff19b670984b5e2ed3576567d590442",
-                    "nonce" : "0x48f0e997f16e5b77",
+                    "hash" : "0x8319bc9396fa14ac018e59fbcca1ae76c2305e309589aad897a5954721bcf31e",
+                    "mixHash" : "0xa54a0f1a41b96d5ab8dcdf4b59247da7f50e4f7d05c4411537bc8526b4a638ab",
+                    "nonce" : "0xaa587a4709fa1575",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0x39bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a08001fb43893a543cf350175bed7f5d246ff19b670984b5e2ed3576567d5904428848f0e997f16e5b77f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0a54a0f1a41b96d5ab8dcdf4b59247da7f50e4f7d05c4411537bc8526b4a638ab88aa587a4709fa1575f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c734c2ed74a035bcb3656c23799026a99b0d7f182aa527f252ba81a226cd825",
+        "lastblockhash" : "0x8319bc9396fa14ac018e59fbcca1ae76c2305e309589aad897a5954721bcf31e",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g1v0.json
index 7a73a41bf..272012d57 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g1v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d14g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g1v0Filler.json",
+            "sourceHash" : "7240ab974e12c7f61fd8c8bbe5c80db7477ce974ef8db1f981f09d55df61d0e3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf427",
+                    "hash" : "0x3c890eeb5dd68a5c5eea54ca4c0c3b7337e62547e8f4523f2e47cd58104a941b",
+                    "mixHash" : "0xb496805c10e8da8de5c5ff63580fc4a154605d108ec4b27d901b74026e57ae79",
+                    "nonce" : "0xb2c048da3290f8dc",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44a",
+                    "stateRoot" : "0xbecb9eb7ce280ee90858a2f58cc0847f4e84b0732c738d0e30d554011e467e5e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0ce03a3b34ebfce2ab44b89e2a47ec374d0d69ab42fd513ccd7b1f9190be76d8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0becb9eb7ce280ee90858a2f58cc0847f4e84b0732c738d0e30d554011e467e5ea00ce03a3b34ebfce2ab44b89e2a47ec374d0d69ab42fd513ccd7b1f9190be76d8a01d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4278203e880a0b496805c10e8da8de5c5ff63580fc4a154605d108ec4b27d901b74026e57ae7988b2c048da3290f8dcf8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0f68deeb9738c6a93033104833ed1687c3d7efdf4b03783782fa1905894c568f2a052b55297142bf355554e0d452f031b614949a10d54058f528d5df0f4314960adc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf68deeb9738c6a93033104833ed1687c3d7efdf4b03783782fa1905894c568f2",
+                        "s" : "0x52b55297142bf355554e0d452f031b614949a10d54058f528d5df0f4314960ad",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3c890eeb5dd68a5c5eea54ca4c0c3b7337e62547e8f4523f2e47cd58104a941b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf427",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0bd9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d14g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g1v0Filler.json",
+            "sourceHash" : "7240ab974e12c7f61fd8c8bbe5c80db7477ce974ef8db1f981f09d55df61d0e3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xcb8833aa19346fb2d81f355a1e53808d4eabe8a04a15e1d9ad2427d8234507ce",
+                    "mixHash" : "0xd107abb36a526c46b393b16fa47a884b842d6100781279aad6a4739491c0380c",
+                    "nonce" : "0x83b7c675c4e2fb1e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0ce03a3b34ebfce2ab44b89e2a47ec374d0d69ab42fd513ccd7b1f9190be76d8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea00ce03a3b34ebfce2ab44b89e2a47ec374d0d69ab42fd513ccd7b1f9190be76d8a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0d107abb36a526c46b393b16fa47a884b842d6100781279aad6a4739491c0380c8883b7c675c4e2fb1ef8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0f68deeb9738c6a93033104833ed1687c3d7efdf4b03783782fa1905894c568f2a052b55297142bf355554e0d452f031b614949a10d54058f528d5df0f4314960adc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf68deeb9738c6a93033104833ed1687c3d7efdf4b03783782fa1905894c568f2",
+                        "s" : "0x52b55297142bf355554e0d452f031b614949a10d54058f528d5df0f4314960ad",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcb8833aa19346fb2d81f355a1e53808d4eabe8a04a15e1d9ad2427d8234507ce",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d14g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g1v0Filler.json",
+            "sourceHash" : "7240ab974e12c7f61fd8c8bbe5c80db7477ce974ef8db1f981f09d55df61d0e3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x40e1a46f379aea185032fe597d3edcc8eb209f78eee818fa034f6b6cbf30808a",
+                    "mixHash" : "0x947ffb87e409b31440d1457146eea48fbedd77e42f095bc476bc45663905d810",
+                    "nonce" : "0xdb56d30d2c33b544",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0ce03a3b34ebfce2ab44b89e2a47ec374d0d69ab42fd513ccd7b1f9190be76d8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea00ce03a3b34ebfce2ab44b89e2a47ec374d0d69ab42fd513ccd7b1f9190be76d8a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0947ffb87e409b31440d1457146eea48fbedd77e42f095bc476bc45663905d81088db56d30d2c33b544f8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0f68deeb9738c6a93033104833ed1687c3d7efdf4b03783782fa1905894c568f2a052b55297142bf355554e0d452f031b614949a10d54058f528d5df0f4314960adc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf68deeb9738c6a93033104833ed1687c3d7efdf4b03783782fa1905894c568f2",
+                        "s" : "0x52b55297142bf355554e0d452f031b614949a10d54058f528d5df0f4314960ad",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x40e1a46f379aea185032fe597d3edcc8eb209f78eee818fa034f6b6cbf30808a",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g2v0.json
index 7a73a41bf..851110904 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g2v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d14g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g2v0Filler.json",
+            "sourceHash" : "d73b617a81de8eabda64cf86d3971f34707fd95ce971c6e832bdbabe02f5afe3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf427",
+                    "hash" : "0x038e01a3bc4eaef2e29c93c3a28dea0736c9467345b47f946dfd442a06e6a0df",
+                    "mixHash" : "0xbbbf414f9adb3eed3cae0445a3275f0cc9c3fb0045980d3c37510627e59d4f17",
+                    "nonce" : "0x2b1dae9e1c06a1b4",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44a",
+                    "stateRoot" : "0xbecb9eb7ce280ee90858a2f58cc0847f4e84b0732c738d0e30d554011e467e5e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x45ca964e262ba5b217a8d4bd7f196ee807ff60cc0a6e28bb635f13edda1fa53f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0becb9eb7ce280ee90858a2f58cc0847f4e84b0732c738d0e30d554011e467e5ea045ca964e262ba5b217a8d4bd7f196ee807ff60cc0a6e28bb635f13edda1fa53fa01d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4278203e880a0bbbf414f9adb3eed3cae0445a3275f0cc9c3fb0045980d3c37510627e59d4f17882b1dae9e1c06a1b4f8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0854867bdccf468bda2310850104be09724695e458ab4e86f0cf9cb4169fa6b41a02f7a75c4efe36e939179756680a47ca3fdd150606a207c6ec5a9c7aaa26cd2d7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x854867bdccf468bda2310850104be09724695e458ab4e86f0cf9cb4169fa6b41",
+                        "s" : "0x2f7a75c4efe36e939179756680a47ca3fdd150606a207c6ec5a9c7aaa26cd2d7",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x038e01a3bc4eaef2e29c93c3a28dea0736c9467345b47f946dfd442a06e6a0df",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf427",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0bd9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d14g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g2v0Filler.json",
+            "sourceHash" : "d73b617a81de8eabda64cf86d3971f34707fd95ce971c6e832bdbabe02f5afe3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xb0c3a1a738de16568f454ca3bc688338e2d0e2c2b62b5a5a52baddc499cd6099",
+                    "mixHash" : "0xaa207e46819362a631033728ab77ee47f25af48af0b80151ae2ff99a263dc6dd",
+                    "nonce" : "0xb160e42cabbd141c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x45ca964e262ba5b217a8d4bd7f196ee807ff60cc0a6e28bb635f13edda1fa53f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea045ca964e262ba5b217a8d4bd7f196ee807ff60cc0a6e28bb635f13edda1fa53fa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0aa207e46819362a631033728ab77ee47f25af48af0b80151ae2ff99a263dc6dd88b160e42cabbd141cf8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0854867bdccf468bda2310850104be09724695e458ab4e86f0cf9cb4169fa6b41a02f7a75c4efe36e939179756680a47ca3fdd150606a207c6ec5a9c7aaa26cd2d7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x854867bdccf468bda2310850104be09724695e458ab4e86f0cf9cb4169fa6b41",
+                        "s" : "0x2f7a75c4efe36e939179756680a47ca3fdd150606a207c6ec5a9c7aaa26cd2d7",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb0c3a1a738de16568f454ca3bc688338e2d0e2c2b62b5a5a52baddc499cd6099",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d14g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g2v0Filler.json",
+            "sourceHash" : "d73b617a81de8eabda64cf86d3971f34707fd95ce971c6e832bdbabe02f5afe3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xb765c1f0dcfb1cf195667244633183f671e49a410293df712e0507f6338f82ba",
+                    "mixHash" : "0xf2398b8263fe08d5618cc91b16c5ba003ccb25ae903a0cc6e76e28e1efcf9b22",
+                    "nonce" : "0xda6fa9544df02452",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x45ca964e262ba5b217a8d4bd7f196ee807ff60cc0a6e28bb635f13edda1fa53f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea045ca964e262ba5b217a8d4bd7f196ee807ff60cc0a6e28bb635f13edda1fa53fa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0f2398b8263fe08d5618cc91b16c5ba003ccb25ae903a0cc6e76e28e1efcf9b2288da6fa9544df02452f8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0854867bdccf468bda2310850104be09724695e458ab4e86f0cf9cb4169fa6b41a02f7a75c4efe36e939179756680a47ca3fdd150606a207c6ec5a9c7aaa26cd2d7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x854867bdccf468bda2310850104be09724695e458ab4e86f0cf9cb4169fa6b41",
+                        "s" : "0x2f7a75c4efe36e939179756680a47ca3fdd150606a207c6ec5a9c7aaa26cd2d7",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb765c1f0dcfb1cf195667244633183f671e49a410293df712e0507f6338f82ba",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g3v0.json
index 7a73a41bf..be3f50fc9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g3v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d14g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g3v0Filler.json",
+            "sourceHash" : "049606ca0c87c25fbe37eb87eeeee4b651248ff9dea5d01b7c0e094e17186f18"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf427",
+                    "hash" : "0x67051008358a727a034cff58b24d3299427d33b4e067373df3de20c942ea7886",
+                    "mixHash" : "0x0d95bd924c0e4a50a18895483a6c3162f9a97d88debc3541aff332895b6435a1",
+                    "nonce" : "0x7717955077e7a641",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44a",
+                    "stateRoot" : "0xbecb9eb7ce280ee90858a2f58cc0847f4e84b0732c738d0e30d554011e467e5e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe90a42a8bc12e87722f431f4158074446a4c0bce3389aa71189766aeba5f2440",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0becb9eb7ce280ee90858a2f58cc0847f4e84b0732c738d0e30d554011e467e5ea0e90a42a8bc12e87722f431f4158074446a4c0bce3389aa71189766aeba5f2440a01d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4278203e880a00d95bd924c0e4a50a18895483a6c3162f9a97d88debc3541aff332895b6435a1887717955077e7a641f8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca07739bcad138184db7b90f233800ee74e4396b6d3c19d518fd6367c823b92e9b0a029f4fc0402250eaf8203e1be1d8729e03bdc5add119f53fcf65a5ec38db003e7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7739bcad138184db7b90f233800ee74e4396b6d3c19d518fd6367c823b92e9b0",
+                        "s" : "0x29f4fc0402250eaf8203e1be1d8729e03bdc5add119f53fcf65a5ec38db003e7",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x67051008358a727a034cff58b24d3299427d33b4e067373df3de20c942ea7886",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf427",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0bd9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d14g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g3v0Filler.json",
+            "sourceHash" : "049606ca0c87c25fbe37eb87eeeee4b651248ff9dea5d01b7c0e094e17186f18"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x91d2c0a762bd70b1469823c22f553a54e34cbb07e5338862c11fb9b00cf60faf",
+                    "mixHash" : "0xf47d6d11db9fd669614a503279e1338b41ecdbf5aabae92ff147069ec32879a7",
+                    "nonce" : "0xad7f63027c61c0bd",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe90a42a8bc12e87722f431f4158074446a4c0bce3389aa71189766aeba5f2440",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea0e90a42a8bc12e87722f431f4158074446a4c0bce3389aa71189766aeba5f2440a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0f47d6d11db9fd669614a503279e1338b41ecdbf5aabae92ff147069ec32879a788ad7f63027c61c0bdf8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca07739bcad138184db7b90f233800ee74e4396b6d3c19d518fd6367c823b92e9b0a029f4fc0402250eaf8203e1be1d8729e03bdc5add119f53fcf65a5ec38db003e7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7739bcad138184db7b90f233800ee74e4396b6d3c19d518fd6367c823b92e9b0",
+                        "s" : "0x29f4fc0402250eaf8203e1be1d8729e03bdc5add119f53fcf65a5ec38db003e7",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x91d2c0a762bd70b1469823c22f553a54e34cbb07e5338862c11fb9b00cf60faf",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d14g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g3v0Filler.json",
+            "sourceHash" : "049606ca0c87c25fbe37eb87eeeee4b651248ff9dea5d01b7c0e094e17186f18"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x6c408962b310d3c5a89cc464021167c9a9c47a84947918032f52f6d19a2d2a19",
+                    "mixHash" : "0x4d7df1c19f7c7d6361d1d9046ab3767314a4750a57aa5e0981f8df958ad439f9",
+                    "nonce" : "0x13c0b90eafa60152",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe90a42a8bc12e87722f431f4158074446a4c0bce3389aa71189766aeba5f2440",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea0e90a42a8bc12e87722f431f4158074446a4c0bce3389aa71189766aeba5f2440a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a04d7df1c19f7c7d6361d1d9046ab3767314a4750a57aa5e0981f8df958ad439f98813c0b90eafa60152f8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca07739bcad138184db7b90f233800ee74e4396b6d3c19d518fd6367c823b92e9b0a029f4fc0402250eaf8203e1be1d8729e03bdc5add119f53fcf65a5ec38db003e7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7739bcad138184db7b90f233800ee74e4396b6d3c19d518fd6367c823b92e9b0",
+                        "s" : "0x29f4fc0402250eaf8203e1be1d8729e03bdc5add119f53fcf65a5ec38db003e7",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6c408962b310d3c5a89cc464021167c9a9c47a84947918032f52f6d19a2d2a19",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g0v0.json
index 022ab4ddb..b0caa8d03 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d15g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g0v0Filler.json",
             "sourceHash" : "8b61844302eea918ac1e7531b0b29468afab3c073a0bd07845f4092973dcb2b2"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0x956e40dbcc79b264fa6c0cec17ef58c95679facd96397024b05a2a619be5c308",
-                    "mixHash" : "0xb6691d7029a5fc054cefa65ceb521a194a5b56f5430a0c2ec9604bab81e22027",
-                    "nonce" : "0xad6b9c2a40073bb3",
+                    "hash" : "0x6cbe9064e60efac20d422f060dff4846463506d0364fad65c671096f9d8ad05b",
+                    "mixHash" : "0x96f8ff14e129e3fbb7329a3cab212d48c15790739a7b9ee286a24166cb587cad",
+                    "nonce" : "0xba2a955c1d0c29e6",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x54d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0b6691d7029a5fc054cefa65ceb521a194a5b56f5430a0c2ec9604bab81e2202788ad6b9c2a40073bb3f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a096f8ff14e129e3fbb7329a3cab212d48c15790739a7b9ee286a24166cb587cad88ba2a955c1d0c29e6f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x956e40dbcc79b264fa6c0cec17ef58c95679facd96397024b05a2a619be5c308",
+        "lastblockhash" : "0x6cbe9064e60efac20d422f060dff4846463506d0364fad65c671096f9d8ad05b",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d15g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g0v0Filler.json",
             "sourceHash" : "8b61844302eea918ac1e7531b0b29468afab3c073a0bd07845f4092973dcb2b2"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0x365fe6e3db44d0d97e4207b29f02fec6f7a8a6d62d9f87ca72d4ed36d985beb1",
-                    "mixHash" : "0xede6b2d771af115897b74a7436789f3ac5f9805c59b3b1270739de87afd36e03",
-                    "nonce" : "0x9efa8ea4f93d6f32",
+                    "hash" : "0xb35771fb2493b7e374a01ffede3f6bfb8ff3b56ac22176f4bf5971e88c482917",
+                    "mixHash" : "0x59aacfde8713543ff406b58cc2576416720a840375c8a548b622cec9943b3a51",
+                    "nonce" : "0x500721d74bc32628",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0x54d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0ede6b2d771af115897b74a7436789f3ac5f9805c59b3b1270739de87afd36e03889efa8ea4f93d6f32f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a059aacfde8713543ff406b58cc2576416720a840375c8a548b622cec9943b3a5188500721d74bc32628f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x365fe6e3db44d0d97e4207b29f02fec6f7a8a6d62d9f87ca72d4ed36d985beb1",
+        "lastblockhash" : "0xb35771fb2493b7e374a01ffede3f6bfb8ff3b56ac22176f4bf5971e88c482917",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d15g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g0v0Filler.json",
             "sourceHash" : "8b61844302eea918ac1e7531b0b29468afab3c073a0bd07845f4092973dcb2b2"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0xa4b180d34e674f47659d5a67edf399496ae869211f46c63adf7fe3dc0f04c434",
-                    "mixHash" : "0x43ab7c639de751623a41944d4d69f1dc7a6438156e403fb9f27db8afa29aac8e",
-                    "nonce" : "0xda0398bbd991cd01",
+                    "hash" : "0xbf1c8a98ed99f7a948d44dbbd88c5944fa9b5afec3d95c9b2b3582bdc2bf4c11",
+                    "mixHash" : "0x946ad780968b349d3bd06d457c7f1028d87f320d76e9f5e7788542c8c921a4ee",
+                    "nonce" : "0xfe709b630a0b2dc7",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0x54d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a043ab7c639de751623a41944d4d69f1dc7a6438156e403fb9f27db8afa29aac8e88da0398bbd991cd01f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0946ad780968b349d3bd06d457c7f1028d87f320d76e9f5e7788542c8c921a4ee88fe709b630a0b2dc7f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa4b180d34e674f47659d5a67edf399496ae869211f46c63adf7fe3dc0f04c434",
+        "lastblockhash" : "0xbf1c8a98ed99f7a948d44dbbd88c5944fa9b5afec3d95c9b2b3582bdc2bf4c11",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g1v0.json
index 7a73a41bf..fb414168f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d15g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g1v0Filler.json",
+            "sourceHash" : "ed7d7e21478ad44b57ba32606575aa895893b50f938b857021863a42b4b71885"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xab5a8c12550916360a529eb0f4c20bbf184a1997c69b50fe558c83371bd3ae50",
+                    "mixHash" : "0x4d80c489db582b036cd66e0668978ae8427012f49b84e1cc8f1514304cc724fc",
+                    "nonce" : "0xe099556a98341bf7",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x4a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3f586c7526c77f6331d7a21ae4baf7d14c08aaa6120dd23a5611faa7177fa852",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a03f586c7526c77f6331d7a21ae4baf7d14c08aaa6120dd23a5611faa7177fa852a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a04d80c489db582b036cd66e0668978ae8427012f49b84e1cc8f1514304cc724fc88e099556a98341bf7f8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba0296a8eb47ccb08b32a7f3c0410161eb4a74e069cc4a5afa383e2e2b00e9cda1aa00a2b5c4e328a36f28b37ad775646170270c5b3be891cfbe5a934e8bc02f568a0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x296a8eb47ccb08b32a7f3c0410161eb4a74e069cc4a5afa383e2e2b00e9cda1a",
+                        "s" : "0x0a2b5c4e328a36f28b37ad775646170270c5b3be891cfbe5a934e8bc02f568a0",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xab5a8c12550916360a529eb0f4c20bbf184a1997c69b50fe558c83371bd3ae50",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d15g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g1v0Filler.json",
+            "sourceHash" : "ed7d7e21478ad44b57ba32606575aa895893b50f938b857021863a42b4b71885"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xd088265014b52eb23a0b623850e067191040d9361c4796d1fcfac686d3613ddb",
+                    "mixHash" : "0xde537e1b64d7458f564b514aa9ebcd6d8bda25bc6f2f0ed414806d30f2623803",
+                    "nonce" : "0x00739537efabcd90",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3f586c7526c77f6331d7a21ae4baf7d14c08aaa6120dd23a5611faa7177fa852",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea03f586c7526c77f6331d7a21ae4baf7d14c08aaa6120dd23a5611faa7177fa852a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0de537e1b64d7458f564b514aa9ebcd6d8bda25bc6f2f0ed414806d30f26238038800739537efabcd90f8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba0296a8eb47ccb08b32a7f3c0410161eb4a74e069cc4a5afa383e2e2b00e9cda1aa00a2b5c4e328a36f28b37ad775646170270c5b3be891cfbe5a934e8bc02f568a0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x296a8eb47ccb08b32a7f3c0410161eb4a74e069cc4a5afa383e2e2b00e9cda1a",
+                        "s" : "0x0a2b5c4e328a36f28b37ad775646170270c5b3be891cfbe5a934e8bc02f568a0",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd088265014b52eb23a0b623850e067191040d9361c4796d1fcfac686d3613ddb",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d15g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g1v0Filler.json",
+            "sourceHash" : "ed7d7e21478ad44b57ba32606575aa895893b50f938b857021863a42b4b71885"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x091bc4d4e4b9cba8208ca700c9f5581eb5c077c67f568d0efb47d295a1680efe",
+                    "mixHash" : "0xe4819b60ed59afe13830b92d1adc3629b6e1f789d4d3c431fe779261f32eeb76",
+                    "nonce" : "0x2a10ed4d1be75376",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3f586c7526c77f6331d7a21ae4baf7d14c08aaa6120dd23a5611faa7177fa852",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea03f586c7526c77f6331d7a21ae4baf7d14c08aaa6120dd23a5611faa7177fa852a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0e4819b60ed59afe13830b92d1adc3629b6e1f789d4d3c431fe779261f32eeb76882a10ed4d1be75376f8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba0296a8eb47ccb08b32a7f3c0410161eb4a74e069cc4a5afa383e2e2b00e9cda1aa00a2b5c4e328a36f28b37ad775646170270c5b3be891cfbe5a934e8bc02f568a0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x296a8eb47ccb08b32a7f3c0410161eb4a74e069cc4a5afa383e2e2b00e9cda1a",
+                        "s" : "0x0a2b5c4e328a36f28b37ad775646170270c5b3be891cfbe5a934e8bc02f568a0",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x091bc4d4e4b9cba8208ca700c9f5581eb5c077c67f568d0efb47d295a1680efe",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g2v0.json
index 7a73a41bf..8032a0f33 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d15g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g2v0Filler.json",
+            "sourceHash" : "17fa133f69423451ed6a27074ce5cddd41958cf821c2a669ec4a1c2c3f2475c9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x9117b3930021ae5b4bcb403f0e5e00df62d248c075c77af41d773c33647d494f",
+                    "mixHash" : "0x5b34028eb2b25f6b4761fce66f65dee55a6612fd257cc3a27eb1642e4294f858",
+                    "nonce" : "0x11e7aadf51abf0bd",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x4a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2d5597797a41d3b4bb434699b0d6352a3aebd9ecf97e6c9c8b65bf14825a5290",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a02d5597797a41d3b4bb434699b0d6352a3aebd9ecf97e6c9c8b65bf14825a5290a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a05b34028eb2b25f6b4761fce66f65dee55a6612fd257cc3a27eb1642e4294f8588811e7aadf51abf0bdf8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba0578a0307926878378a8e2dda6d684487eeb3dad5f855ae9d6618329e2254b349a00f87fdd6311b5ec4a17b8c39467dc5e84b3bb6b2a1bb00bdae1aa33d3018b2c7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x578a0307926878378a8e2dda6d684487eeb3dad5f855ae9d6618329e2254b349",
+                        "s" : "0x0f87fdd6311b5ec4a17b8c39467dc5e84b3bb6b2a1bb00bdae1aa33d3018b2c7",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9117b3930021ae5b4bcb403f0e5e00df62d248c075c77af41d773c33647d494f",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d15g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g2v0Filler.json",
+            "sourceHash" : "17fa133f69423451ed6a27074ce5cddd41958cf821c2a669ec4a1c2c3f2475c9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x4e00a44bf0783f5ef4d70ceddb7f49c311129ec4b0530bde829438e8344dcfe5",
+                    "mixHash" : "0x776dbba41b1d2790ba4919bdf069ef94c21986d0cfeb239efc21eedd418cb9ee",
+                    "nonce" : "0xced13d2dab5c869b",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2d5597797a41d3b4bb434699b0d6352a3aebd9ecf97e6c9c8b65bf14825a5290",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea02d5597797a41d3b4bb434699b0d6352a3aebd9ecf97e6c9c8b65bf14825a5290a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0776dbba41b1d2790ba4919bdf069ef94c21986d0cfeb239efc21eedd418cb9ee88ced13d2dab5c869bf8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba0578a0307926878378a8e2dda6d684487eeb3dad5f855ae9d6618329e2254b349a00f87fdd6311b5ec4a17b8c39467dc5e84b3bb6b2a1bb00bdae1aa33d3018b2c7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x578a0307926878378a8e2dda6d684487eeb3dad5f855ae9d6618329e2254b349",
+                        "s" : "0x0f87fdd6311b5ec4a17b8c39467dc5e84b3bb6b2a1bb00bdae1aa33d3018b2c7",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4e00a44bf0783f5ef4d70ceddb7f49c311129ec4b0530bde829438e8344dcfe5",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d15g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g2v0Filler.json",
+            "sourceHash" : "17fa133f69423451ed6a27074ce5cddd41958cf821c2a669ec4a1c2c3f2475c9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x85bcd72fff8ff4eb38a9facd7af7b51bd53399a872ae9d831f7efcb4ae637c0f",
+                    "mixHash" : "0xabd8c6aae3bb7569053aab277b1fe7a921461bb35e67b46e39345f3bc88853c8",
+                    "nonce" : "0x9f076dc397cd5025",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2d5597797a41d3b4bb434699b0d6352a3aebd9ecf97e6c9c8b65bf14825a5290",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea02d5597797a41d3b4bb434699b0d6352a3aebd9ecf97e6c9c8b65bf14825a5290a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0abd8c6aae3bb7569053aab277b1fe7a921461bb35e67b46e39345f3bc88853c8889f076dc397cd5025f8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba0578a0307926878378a8e2dda6d684487eeb3dad5f855ae9d6618329e2254b349a00f87fdd6311b5ec4a17b8c39467dc5e84b3bb6b2a1bb00bdae1aa33d3018b2c7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x578a0307926878378a8e2dda6d684487eeb3dad5f855ae9d6618329e2254b349",
+                        "s" : "0x0f87fdd6311b5ec4a17b8c39467dc5e84b3bb6b2a1bb00bdae1aa33d3018b2c7",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x85bcd72fff8ff4eb38a9facd7af7b51bd53399a872ae9d831f7efcb4ae637c0f",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g3v0.json
index 7a73a41bf..3dae71817 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d15g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g3v0Filler.json",
+            "sourceHash" : "f977d221dcf029e59a05af18e05e3537eb533ff2b88284e28be55611adf5d108"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x2af58648e5681f73e64b0e5dbca23453ded262f149dd0181f5e6d46bdc2177ea",
+                    "mixHash" : "0x45adc2f1e3f10587aab56ec6725a3acc28b79fedba02e833d818b9a01cb4c003",
+                    "nonce" : "0x4f06e42426249778",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x4a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x00d89e0412bdb9656fa74d647c76d8ad04897b204bbdd234b954ad357b7a24fd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a000d89e0412bdb9656fa74d647c76d8ad04897b204bbdd234b954ad357b7a24fda0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a045adc2f1e3f10587aab56ec6725a3acc28b79fedba02e833d818b9a01cb4c003884f06e42426249778f8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba09438e267b872e93ce209802ad035dbdd556917b0a1ae16b63fb2a1c1094c8928a06863153a24a2c0d710b1c4dae18cebca04dc1348d4775659f5efa42ff5c7cf62c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9438e267b872e93ce209802ad035dbdd556917b0a1ae16b63fb2a1c1094c8928",
+                        "s" : "0x6863153a24a2c0d710b1c4dae18cebca04dc1348d4775659f5efa42ff5c7cf62",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2af58648e5681f73e64b0e5dbca23453ded262f149dd0181f5e6d46bdc2177ea",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d15g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g3v0Filler.json",
+            "sourceHash" : "f977d221dcf029e59a05af18e05e3537eb533ff2b88284e28be55611adf5d108"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xe5a0d464a137776be4132ef3eb3a34a3ba430d671647b70e96196c1825e68bb1",
+                    "mixHash" : "0x31ef2634c705e3f18ff2925eaf6ab259a36e4c37587dcd4f6f5816e6ee177fbb",
+                    "nonce" : "0x9067bad6299b7004",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x00d89e0412bdb9656fa74d647c76d8ad04897b204bbdd234b954ad357b7a24fd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea000d89e0412bdb9656fa74d647c76d8ad04897b204bbdd234b954ad357b7a24fda07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a031ef2634c705e3f18ff2925eaf6ab259a36e4c37587dcd4f6f5816e6ee177fbb889067bad6299b7004f8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba09438e267b872e93ce209802ad035dbdd556917b0a1ae16b63fb2a1c1094c8928a06863153a24a2c0d710b1c4dae18cebca04dc1348d4775659f5efa42ff5c7cf62c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9438e267b872e93ce209802ad035dbdd556917b0a1ae16b63fb2a1c1094c8928",
+                        "s" : "0x6863153a24a2c0d710b1c4dae18cebca04dc1348d4775659f5efa42ff5c7cf62",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe5a0d464a137776be4132ef3eb3a34a3ba430d671647b70e96196c1825e68bb1",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d15g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g3v0Filler.json",
+            "sourceHash" : "f977d221dcf029e59a05af18e05e3537eb533ff2b88284e28be55611adf5d108"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x9851ce83d746e48b86c1f0bad99695d44367e68a36d50c7d5f35612b96b08c5e",
+                    "mixHash" : "0x070950e858be18ae433cf95986e3485472727ba99140f0ffc2d4027859d953f4",
+                    "nonce" : "0x6d4a4fe792b4483d",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x00d89e0412bdb9656fa74d647c76d8ad04897b204bbdd234b954ad357b7a24fd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea000d89e0412bdb9656fa74d647c76d8ad04897b204bbdd234b954ad357b7a24fda07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0070950e858be18ae433cf95986e3485472727ba99140f0ffc2d4027859d953f4886d4a4fe792b4483df8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba09438e267b872e93ce209802ad035dbdd556917b0a1ae16b63fb2a1c1094c8928a06863153a24a2c0d710b1c4dae18cebca04dc1348d4775659f5efa42ff5c7cf62c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9438e267b872e93ce209802ad035dbdd556917b0a1ae16b63fb2a1c1094c8928",
+                        "s" : "0x6863153a24a2c0d710b1c4dae18cebca04dc1348d4775659f5efa42ff5c7cf62",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9851ce83d746e48b86c1f0bad99695d44367e68a36d50c7d5f35612b96b08c5e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g0v0.json
index 0906c9a02..be3b3bb88 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d16g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g0v0Filler.json",
             "sourceHash" : "39b7874a173114bc0370a543adbdeb76b92953566b40b6cf98de9d2781308a88"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf4af",
-                    "hash" : "0x50a40789bab4ceea273f5478e13187c9fd32b0044af09d6a03316f3714fbb14e",
-                    "mixHash" : "0xb7fa49cb826930584efda75c107742141965f0ace78de88976c0f9d5de80533f",
-                    "nonce" : "0x7a1c9c07fe4411bb",
+                    "hash" : "0x4fc0ce18839e3341d4f152fe78ef8037dc28dbb909310c087713eeab7e5cc033",
+                    "mixHash" : "0x108b90cacd9c01d7b5b49839a713528fcce1014a3aed1113f56b41127f6a802a",
+                    "nonce" : "0x9c37c5687f35e3cc",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7957589173ee35776e555067dcd4c973d31b944be4bca370de576dd5d2bfe72a0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a0510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4af8203e880a0b7fa49cb826930584efda75c107742141965f0ace78de88976c0f9d5de80533f887a1c9c07fe4411bbf8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7957589173ee35776e555067dcd4c973d31b944be4bca370de576dd5d2bfe72a0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a0510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4af8203e880a0108b90cacd9c01d7b5b49839a713528fcce1014a3aed1113f56b41127f6a802a889c37c5687f35e3ccf8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50a40789bab4ceea273f5478e13187c9fd32b0044af09d6a03316f3714fbb14e",
+        "lastblockhash" : "0x4fc0ce18839e3341d4f152fe78ef8037dc28dbb909310c087713eeab7e5cc033",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d16g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g0v0Filler.json",
             "sourceHash" : "39b7874a173114bc0370a543adbdeb76b92953566b40b6cf98de9d2781308a88"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba17",
-                    "hash" : "0x2e4f6b9e6495cdf5bce07ea4647bb215bb84ed43cb3936fc8b580f555e02c148",
-                    "mixHash" : "0xf066f883f07e90d90cbdfe4a41ca9744db647ec61b1d4c3d83c5392e329d4d4f",
-                    "nonce" : "0x6f998853a8196646",
+                    "hash" : "0x50339c5447aeae1b89bb2e14cce523759315dd82c58152b007ccf4d454047f86",
+                    "mixHash" : "0x461e37d4b002cc48ed7af7eb0786875b466571008155e58c9966ed63c486be59",
+                    "nonce" : "0x3ffe64d6c060adef",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0x669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a0f066f883f07e90d90cbdfe4a41ca9744db647ec61b1d4c3d83c5392e329d4d4f886f998853a8196646f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a0461e37d4b002cc48ed7af7eb0786875b466571008155e58c9966ed63c486be59883ffe64d6c060adeff8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e4f6b9e6495cdf5bce07ea4647bb215bb84ed43cb3936fc8b580f555e02c148",
+        "lastblockhash" : "0x50339c5447aeae1b89bb2e14cce523759315dd82c58152b007ccf4d454047f86",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d16g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g0v0Filler.json",
             "sourceHash" : "39b7874a173114bc0370a543adbdeb76b92953566b40b6cf98de9d2781308a88"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba17",
-                    "hash" : "0xf9ee01b63198c324ddeab4b9ff78243b4414c43d94e9846a95d935fc13c55ba4",
-                    "mixHash" : "0x7427fb511523140cae0da7108efe261714d00ca803b6057213219e7a0aaa79b7",
-                    "nonce" : "0x5af3657bbc8b7274",
+                    "hash" : "0x1bf741522fff1a1f3326d76496e72ea0e3b5b5b9739fb336de0b4c0b405dcff2",
+                    "mixHash" : "0xbaf9656d9a078c9d5bb0834c4392f06b18f06d422ec2771be0ac9276a02609f9",
+                    "nonce" : "0xf057e35cd3ff7d84",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0x669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a07427fb511523140cae0da7108efe261714d00ca803b6057213219e7a0aaa79b7885af3657bbc8b7274f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a0baf9656d9a078c9d5bb0834c4392f06b18f06d422ec2771be0ac9276a02609f988f057e35cd3ff7d84f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9ee01b63198c324ddeab4b9ff78243b4414c43d94e9846a95d935fc13c55ba4",
+        "lastblockhash" : "0x1bf741522fff1a1f3326d76496e72ea0e3b5b5b9739fb336de0b4c0b405dcff2",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g1v0.json
index 7a73a41bf..1186f85d6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g1v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d16g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g1v0Filler.json",
+            "sourceHash" : "f684a090f54900cdf1ab5e79c3dbba76e777b72f33d65692907488805e743837"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4af",
+                    "hash" : "0x7479ff5907fcdcd71000d0b3305775607f9c5b1253771f787008613939ebe2c4",
+                    "mixHash" : "0x8ee6ac58850c15e9064383bbbccbf2f0e418028f52272c5a0ff94a65ef1cb3b7",
+                    "nonce" : "0x8f1222989b68d941",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97",
+                    "stateRoot" : "0xc7957589173ee35776e555067dcd4c973d31b944be4bca370de576dd5d2bfe72",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6ce5e1058639b2933e5ea29304473b051919fc8ed6237893d0e0d88e95784318",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7957589173ee35776e555067dcd4c973d31b944be4bca370de576dd5d2bfe72a06ce5e1058639b2933e5ea29304473b051919fc8ed6237893d0e0d88e95784318a0510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4af8203e880a08ee6ac58850c15e9064383bbbccbf2f0e418028f52272c5a0ff94a65ef1cb3b7888f1222989b68d941f8c7f8c5800183015f9094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ca00cb7350af019ddd4fcbe08647fc6c20aeea32605d7a31c34ad720622abc06d47a00b7926e48c6542945b79a1a3622007273e8204d27f50a81ae60b61ea1ef324ffc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0cb7350af019ddd4fcbe08647fc6c20aeea32605d7a31c34ad720622abc06d47",
+                        "s" : "0x0b7926e48c6542945b79a1a3622007273e8204d27f50a81ae60b61ea1ef324ff",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7479ff5907fcdcd71000d0b3305775607f9c5b1253771f787008613939ebe2c4",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf4af",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b51",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d16g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g1v0Filler.json",
+            "sourceHash" : "f684a090f54900cdf1ab5e79c3dbba76e777b72f33d65692907488805e743837"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba17",
+                    "hash" : "0xcce7f1689dbd69b7cc17b83aa5630e4b85d190463aaa53d45f479ecbc24684ee",
+                    "mixHash" : "0x9175823d5752b957cfebc3ef025bef8f17414a94ba3898a48b1974b20d9fdd05",
+                    "nonce" : "0xff315014ba1e7d5c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x8341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71",
+                    "stateRoot" : "0x3654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6ce5e1058639b2933e5ea29304473b051919fc8ed6237893d0e0d88e95784318",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a06ce5e1058639b2933e5ea29304473b051919fc8ed6237893d0e0d88e95784318a08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a09175823d5752b957cfebc3ef025bef8f17414a94ba3898a48b1974b20d9fdd0588ff315014ba1e7d5cf8c7f8c5800183015f9094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ca00cb7350af019ddd4fcbe08647fc6c20aeea32605d7a31c34ad720622abc06d47a00b7926e48c6542945b79a1a3622007273e8204d27f50a81ae60b61ea1ef324ffc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0cb7350af019ddd4fcbe08647fc6c20aeea32605d7a31c34ad720622abc06d47",
+                        "s" : "0x0b7926e48c6542945b79a1a3622007273e8204d27f50a81ae60b61ea1ef324ff",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcce7f1689dbd69b7cc17b83aa5630e4b85d190463aaa53d45f479ecbc24684ee",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba17",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45e9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d16g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g1v0Filler.json",
+            "sourceHash" : "f684a090f54900cdf1ab5e79c3dbba76e777b72f33d65692907488805e743837"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba17",
+                    "hash" : "0x5888ec4fada7d1e95db4bb57234d9f6a8841a8183f80cc89327694d5c223a041",
+                    "mixHash" : "0x7b7e68c1434d422b409a51df180518ef74b3827b18c43e5f1f367a8c667ff6d2",
+                    "nonce" : "0x2e62b67995399f88",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x8341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71",
+                    "stateRoot" : "0x3654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6ce5e1058639b2933e5ea29304473b051919fc8ed6237893d0e0d88e95784318",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a06ce5e1058639b2933e5ea29304473b051919fc8ed6237893d0e0d88e95784318a08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a07b7e68c1434d422b409a51df180518ef74b3827b18c43e5f1f367a8c667ff6d2882e62b67995399f88f8c7f8c5800183015f9094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ca00cb7350af019ddd4fcbe08647fc6c20aeea32605d7a31c34ad720622abc06d47a00b7926e48c6542945b79a1a3622007273e8204d27f50a81ae60b61ea1ef324ffc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0cb7350af019ddd4fcbe08647fc6c20aeea32605d7a31c34ad720622abc06d47",
+                        "s" : "0x0b7926e48c6542945b79a1a3622007273e8204d27f50a81ae60b61ea1ef324ff",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5888ec4fada7d1e95db4bb57234d9f6a8841a8183f80cc89327694d5c223a041",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba17",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45e9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g2v0.json
index 7a73a41bf..4762c7de9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g2v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d16g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g2v0Filler.json",
+            "sourceHash" : "1f9f19b670425839beb78ebc0741d7edd17c97703be4ea9412682da400086b75"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4af",
+                    "hash" : "0x9f3fc5fbfb8051042fa3b539058cf6c5da11325a65ae826fb5b9bf6798cd7524",
+                    "mixHash" : "0x71bb24e67ff7c716df34e8579b93d1ceb4511f290dc9c2c0a1054d7475ac5f4f",
+                    "nonce" : "0x481f33b95e651843",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97",
+                    "stateRoot" : "0xc7957589173ee35776e555067dcd4c973d31b944be4bca370de576dd5d2bfe72",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3716d0e466b87a0f24339470a22684b16130eac4688140cbd4e2fc6a849489dc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7957589173ee35776e555067dcd4c973d31b944be4bca370de576dd5d2bfe72a03716d0e466b87a0f24339470a22684b16130eac4688140cbd4e2fc6a849489dca0510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4af8203e880a071bb24e67ff7c716df34e8579b93d1ceb4511f290dc9c2c0a1054d7475ac5f4f88481f33b95e651843f8c7f8c580018301adb094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba07222787ab89b03edac4f16e79db532a6cdcb2689a853b133a91c3b7400827c20a051e12e2724bf657605743fc94c20626fdfc66b4298d0ccac69cd6a49a7925ed5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7222787ab89b03edac4f16e79db532a6cdcb2689a853b133a91c3b7400827c20",
+                        "s" : "0x51e12e2724bf657605743fc94c20626fdfc66b4298d0ccac69cd6a49a7925ed5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9f3fc5fbfb8051042fa3b539058cf6c5da11325a65ae826fb5b9bf6798cd7524",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf4af",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b51",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d16g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g2v0Filler.json",
+            "sourceHash" : "1f9f19b670425839beb78ebc0741d7edd17c97703be4ea9412682da400086b75"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba17",
+                    "hash" : "0x2ce3b3addb0ce33a2278fce4ac48f2d6a9025d4f6c476efb917fb9b6fbb815ac",
+                    "mixHash" : "0x73a04e7e50a4852ceb1cc1bc139b4a2e4bb441ab3ec3850ad345e4829a1e6f82",
+                    "nonce" : "0x2fac214c15a2173f",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x8341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71",
+                    "stateRoot" : "0x3654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3716d0e466b87a0f24339470a22684b16130eac4688140cbd4e2fc6a849489dc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a03716d0e466b87a0f24339470a22684b16130eac4688140cbd4e2fc6a849489dca08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a073a04e7e50a4852ceb1cc1bc139b4a2e4bb441ab3ec3850ad345e4829a1e6f82882fac214c15a2173ff8c7f8c580018301adb094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba07222787ab89b03edac4f16e79db532a6cdcb2689a853b133a91c3b7400827c20a051e12e2724bf657605743fc94c20626fdfc66b4298d0ccac69cd6a49a7925ed5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7222787ab89b03edac4f16e79db532a6cdcb2689a853b133a91c3b7400827c20",
+                        "s" : "0x51e12e2724bf657605743fc94c20626fdfc66b4298d0ccac69cd6a49a7925ed5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2ce3b3addb0ce33a2278fce4ac48f2d6a9025d4f6c476efb917fb9b6fbb815ac",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba17",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45e9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d16g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g2v0Filler.json",
+            "sourceHash" : "1f9f19b670425839beb78ebc0741d7edd17c97703be4ea9412682da400086b75"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba17",
+                    "hash" : "0xf81739d4a5aed57bd790bf436cc77c768ab7e67655a754255e1ecd38ebd2c25b",
+                    "mixHash" : "0x47ca965d6df069669074e25451271b514134b8d55940d82aedf7bbde4b53eeb3",
+                    "nonce" : "0xc1598e14d55fbef8",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x8341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71",
+                    "stateRoot" : "0x3654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3716d0e466b87a0f24339470a22684b16130eac4688140cbd4e2fc6a849489dc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a03716d0e466b87a0f24339470a22684b16130eac4688140cbd4e2fc6a849489dca08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a047ca965d6df069669074e25451271b514134b8d55940d82aedf7bbde4b53eeb388c1598e14d55fbef8f8c7f8c580018301adb094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba07222787ab89b03edac4f16e79db532a6cdcb2689a853b133a91c3b7400827c20a051e12e2724bf657605743fc94c20626fdfc66b4298d0ccac69cd6a49a7925ed5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7222787ab89b03edac4f16e79db532a6cdcb2689a853b133a91c3b7400827c20",
+                        "s" : "0x51e12e2724bf657605743fc94c20626fdfc66b4298d0ccac69cd6a49a7925ed5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf81739d4a5aed57bd790bf436cc77c768ab7e67655a754255e1ecd38ebd2c25b",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba17",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45e9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g3v0.json
index 7a73a41bf..1d6223844 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g3v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d16g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g3v0Filler.json",
+            "sourceHash" : "918e9aac1e85810e26c0e0e3ddce480340a273d1389782b508666c696a46f909"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4af",
+                    "hash" : "0x683c1abbd40a33620b8fffb003a97064b9b797a7caeb52e71a8b10ec8844f110",
+                    "mixHash" : "0xa29c6fa5bf26a5d365dd69528a58822226e832c72c1f3d57936bb7e8ad9a17c8",
+                    "nonce" : "0xb158f6e4b827b0a6",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97",
+                    "stateRoot" : "0xc7957589173ee35776e555067dcd4c973d31b944be4bca370de576dd5d2bfe72",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x738ed07bdcc71fc84c881605409ab076be3a35bafe0eb8058c2ec008c5ce2d2c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7957589173ee35776e555067dcd4c973d31b944be4bca370de576dd5d2bfe72a0738ed07bdcc71fc84c881605409ab076be3a35bafe0eb8058c2ec008c5ce2d2ca0510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4af8203e880a0a29c6fa5bf26a5d365dd69528a58822226e832c72c1f3d57936bb7e8ad9a17c888b158f6e4b827b0a6f8c7f8c5800183030d4094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0cfab2b5083579508a47773de8bbcec3a44714fc770161f0d2a136a3f1ec9846ea02bb5787e3105a17bdfad147d4a122092c5782be5d69f27e62e96e79b2537f9dec0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcfab2b5083579508a47773de8bbcec3a44714fc770161f0d2a136a3f1ec9846e",
+                        "s" : "0x2bb5787e3105a17bdfad147d4a122092c5782be5d69f27e62e96e79b2537f9de",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x683c1abbd40a33620b8fffb003a97064b9b797a7caeb52e71a8b10ec8844f110",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf4af",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b51",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d16g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g3v0Filler.json",
+            "sourceHash" : "918e9aac1e85810e26c0e0e3ddce480340a273d1389782b508666c696a46f909"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba17",
+                    "hash" : "0x032af82cc464ae3eb2daab555576449a372108540c501c6fb521700720aa0e7c",
+                    "mixHash" : "0x5f072b143e14a8c783944a5af25eecc4641da73cf0ef852e3d1816a73ee6268e",
+                    "nonce" : "0x9f134478ae5dc4cc",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x8341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71",
+                    "stateRoot" : "0x3654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x738ed07bdcc71fc84c881605409ab076be3a35bafe0eb8058c2ec008c5ce2d2c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a0738ed07bdcc71fc84c881605409ab076be3a35bafe0eb8058c2ec008c5ce2d2ca08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a05f072b143e14a8c783944a5af25eecc4641da73cf0ef852e3d1816a73ee6268e889f134478ae5dc4ccf8c7f8c5800183030d4094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0cfab2b5083579508a47773de8bbcec3a44714fc770161f0d2a136a3f1ec9846ea02bb5787e3105a17bdfad147d4a122092c5782be5d69f27e62e96e79b2537f9dec0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcfab2b5083579508a47773de8bbcec3a44714fc770161f0d2a136a3f1ec9846e",
+                        "s" : "0x2bb5787e3105a17bdfad147d4a122092c5782be5d69f27e62e96e79b2537f9de",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x032af82cc464ae3eb2daab555576449a372108540c501c6fb521700720aa0e7c",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba17",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45e9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d16g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g3v0Filler.json",
+            "sourceHash" : "918e9aac1e85810e26c0e0e3ddce480340a273d1389782b508666c696a46f909"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba17",
+                    "hash" : "0xe26e84d2a90ee3170efa0abf648696da3c65d42740e690f54be5ae3389a9e68f",
+                    "mixHash" : "0x0a4948a541aa5f2d1e30192dd0c19b69ccd461dbe3add1b8c6eaf9b64fa9fa82",
+                    "nonce" : "0xb432293098f4a08d",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x8341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71",
+                    "stateRoot" : "0x3654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x738ed07bdcc71fc84c881605409ab076be3a35bafe0eb8058c2ec008c5ce2d2c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a0738ed07bdcc71fc84c881605409ab076be3a35bafe0eb8058c2ec008c5ce2d2ca08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a00a4948a541aa5f2d1e30192dd0c19b69ccd461dbe3add1b8c6eaf9b64fa9fa8288b432293098f4a08df8c7f8c5800183030d4094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0cfab2b5083579508a47773de8bbcec3a44714fc770161f0d2a136a3f1ec9846ea02bb5787e3105a17bdfad147d4a122092c5782be5d69f27e62e96e79b2537f9dec0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcfab2b5083579508a47773de8bbcec3a44714fc770161f0d2a136a3f1ec9846e",
+                        "s" : "0x2bb5787e3105a17bdfad147d4a122092c5782be5d69f27e62e96e79b2537f9de",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe26e84d2a90ee3170efa0abf648696da3c65d42740e690f54be5ae3389a9e68f",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba17",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45e9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g0v0.json
index 8e6ee6867..f3b677cae 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d17g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g0v0Filler.json",
             "sourceHash" : "6c119475fbd7cb0ac3de6e315244ef94a91a1a7e1f45a6084db2dcbd79eaf446"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf4ab",
-                    "hash" : "0xadbac5724c6c701f778de18d06e5aa096e03b8f7b7fcbe459b502da56fbc3654",
-                    "mixHash" : "0x5fb1067a1f8aef489250d50ddddcefcd925607c66e2b287a6116243b1d2d760f",
-                    "nonce" : "0x0d402fe75fd9a5e2",
+                    "hash" : "0x2930b8e6a190fcda1879e68d2602af83f1cbf2d7912ed5c47348838093b8bf9c",
+                    "mixHash" : "0x80e7ebdb40ee8d39ae8783116bd8a2fed9358f8328671386e452e4b02aec5378",
+                    "nonce" : "0xcd1c0515e0e6f471",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x5ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xf17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020cfa3eb229dd081b22df1167b3a01b8481f478cebb07b4a997079f42ef8686da0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a05ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4ab8203e880a05fb1067a1f8aef489250d50ddddcefcd925607c66e2b287a6116243b1d2d760f880d402fe75fd9a5e2f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020cfa3eb229dd081b22df1167b3a01b8481f478cebb07b4a997079f42ef8686da0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a05ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4ab8203e880a080e7ebdb40ee8d39ae8783116bd8a2fed9358f8328671386e452e4b02aec537888cd1c0515e0e6f471f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xadbac5724c6c701f778de18d06e5aa096e03b8f7b7fcbe459b502da56fbc3654",
+        "lastblockhash" : "0x2930b8e6a190fcda1879e68d2602af83f1cbf2d7912ed5c47348838093b8bf9c",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d17g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g0v0Filler.json",
             "sourceHash" : "6c119475fbd7cb0ac3de6e315244ef94a91a1a7e1f45a6084db2dcbd79eaf446"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba13",
-                    "hash" : "0x6eb63ed9279a543379d449b09c35d8bb2f128bccaffac4f65d2c1eb5d7701b4c",
-                    "mixHash" : "0x146d64b4b5adde4fc322f68c222f24d263449b3277efd849257ab5b1bb9517fb",
-                    "nonce" : "0x3de8455965219f5f",
+                    "hash" : "0xd4e0dd7493bf7cc2782d8991a3c8a8c6c864502496ddd5a75ec42e7c1b22f719",
+                    "mixHash" : "0xe27aab4261ffbcdd21d4b917818b3df9b57b7839c83874655b62aa729a017273",
+                    "nonce" : "0xe26550db1432a2df",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0xf17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a0146d64b4b5adde4fc322f68c222f24d263449b3277efd849257ab5b1bb9517fb883de8455965219f5ff8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a0e27aab4261ffbcdd21d4b917818b3df9b57b7839c83874655b62aa729a01727388e26550db1432a2dff8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6eb63ed9279a543379d449b09c35d8bb2f128bccaffac4f65d2c1eb5d7701b4c",
+        "lastblockhash" : "0xd4e0dd7493bf7cc2782d8991a3c8a8c6c864502496ddd5a75ec42e7c1b22f719",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d17g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g0v0Filler.json",
             "sourceHash" : "6c119475fbd7cb0ac3de6e315244ef94a91a1a7e1f45a6084db2dcbd79eaf446"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba13",
-                    "hash" : "0x340af716d9e64187fc9b6397b9797e2a90749505b2815e2df0d14cf52d5690ea",
-                    "mixHash" : "0x67c8c22881bf3c3034d870f42a51f8b7d3af15b24f9e75a41382b56adb00fcf6",
-                    "nonce" : "0xb766aa93ee1e0616",
+                    "hash" : "0xfef5fd54f5c5f76bfad22799e56a8da183212822ddc3f6a0e3f338d2d8cf9452",
+                    "mixHash" : "0x1e4a1959d507f7623c1ee3b8981d70f9f0662c23953b5d27418eeb8445cb5c80",
+                    "nonce" : "0x66e188e99b72bcb7",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0xf17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a067c8c22881bf3c3034d870f42a51f8b7d3af15b24f9e75a41382b56adb00fcf688b766aa93ee1e0616f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a01e4a1959d507f7623c1ee3b8981d70f9f0662c23953b5d27418eeb8445cb5c808866e188e99b72bcb7f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x340af716d9e64187fc9b6397b9797e2a90749505b2815e2df0d14cf52d5690ea",
+        "lastblockhash" : "0xfef5fd54f5c5f76bfad22799e56a8da183212822ddc3f6a0e3f338d2d8cf9452",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g1v0.json
index 7a73a41bf..91a7d4aad 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g1v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d17g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g1v0Filler.json",
+            "sourceHash" : "26bb24fa6abb285e52ad140bd08d5cef48c209524b5ba571d43e2a2e222ee762"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4ab",
+                    "hash" : "0xd109f9e5f00060b0eea9e37e1e889aa1e84195e0f33c57966df14869117e5864",
+                    "mixHash" : "0x3ac3c35663ae57ed408d841dbe365e7435c2fc05812117251ebeeccf31d86a61",
+                    "nonce" : "0xa4cda3448eedeca9",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9",
+                    "stateRoot" : "0x20cfa3eb229dd081b22df1167b3a01b8481f478cebb07b4a997079f42ef8686d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5adb9079e066ccc89d14c35a1dbf22f6d2a88d5d8beebce78b258c534cbf6cae",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020cfa3eb229dd081b22df1167b3a01b8481f478cebb07b4a997079f42ef8686da05adb9079e066ccc89d14c35a1dbf22f6d2a88d5d8beebce78b258c534cbf6caea05ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4ab8203e880a03ac3c35663ae57ed408d841dbe365e7435c2fc05812117251ebeeccf31d86a6188a4cda3448eedeca9f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca0851ea664bcf44d5e398a7ba342da95777dd3ddf899f2438c63b977483c1f47f8a0376af45b9796ee873fccaa1a6983e9dea555fd5c8a3a91ddb67a7e7404624921c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x851ea664bcf44d5e398a7ba342da95777dd3ddf899f2438c63b977483c1f47f8",
+                        "s" : "0x376af45b9796ee873fccaa1a6983e9dea555fd5c8a3a91ddb67a7e7404624921",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd109f9e5f00060b0eea9e37e1e889aa1e84195e0f33c57966df14869117e5864",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0200000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf4ab",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b55",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d17g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g1v0Filler.json",
+            "sourceHash" : "26bb24fa6abb285e52ad140bd08d5cef48c209524b5ba571d43e2a2e222ee762"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0x0951cbd1c28881a053987b1097073a62fa70063e51ad96d13efa9442e18fbfca",
+                    "mixHash" : "0x8161c971d74db4222a7fc603ec9ea924acbfbef80353c4c28da07557f66f0ad7",
+                    "nonce" : "0x362af72f08e42e8c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5adb9079e066ccc89d14c35a1dbf22f6d2a88d5d8beebce78b258c534cbf6cae",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a05adb9079e066ccc89d14c35a1dbf22f6d2a88d5d8beebce78b258c534cbf6caea09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a08161c971d74db4222a7fc603ec9ea924acbfbef80353c4c28da07557f66f0ad788362af72f08e42e8cf8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca0851ea664bcf44d5e398a7ba342da95777dd3ddf899f2438c63b977483c1f47f8a0376af45b9796ee873fccaa1a6983e9dea555fd5c8a3a91ddb67a7e7404624921c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x851ea664bcf44d5e398a7ba342da95777dd3ddf899f2438c63b977483c1f47f8",
+                        "s" : "0x376af45b9796ee873fccaa1a6983e9dea555fd5c8a3a91ddb67a7e7404624921",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0951cbd1c28881a053987b1097073a62fa70063e51ad96d13efa9442e18fbfca",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d17g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g1v0Filler.json",
+            "sourceHash" : "26bb24fa6abb285e52ad140bd08d5cef48c209524b5ba571d43e2a2e222ee762"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0xbd1276eea95e4a92b05b94fc29c57ea0ef77d5b612bf7901279228e1e61ba0ff",
+                    "mixHash" : "0xb42e56b4e6d1dea29291ba0ccb9644b72cf53f0627a358123ddc845359385c92",
+                    "nonce" : "0x555825600940bd5d",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5adb9079e066ccc89d14c35a1dbf22f6d2a88d5d8beebce78b258c534cbf6cae",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a05adb9079e066ccc89d14c35a1dbf22f6d2a88d5d8beebce78b258c534cbf6caea09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a0b42e56b4e6d1dea29291ba0ccb9644b72cf53f0627a358123ddc845359385c9288555825600940bd5df8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca0851ea664bcf44d5e398a7ba342da95777dd3ddf899f2438c63b977483c1f47f8a0376af45b9796ee873fccaa1a6983e9dea555fd5c8a3a91ddb67a7e7404624921c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x851ea664bcf44d5e398a7ba342da95777dd3ddf899f2438c63b977483c1f47f8",
+                        "s" : "0x376af45b9796ee873fccaa1a6983e9dea555fd5c8a3a91ddb67a7e7404624921",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbd1276eea95e4a92b05b94fc29c57ea0ef77d5b612bf7901279228e1e61ba0ff",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g2v0.json
index 7a73a41bf..94375716d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g2v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d17g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g2v0Filler.json",
+            "sourceHash" : "d5e9f68df7b45b6b3e4145e2bb066196122af5f623a1f13b6a5c3f553c0efeb0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4ab",
+                    "hash" : "0xacc6219a9746dce81c9d64f1feac0833f10376c6639de9e126e31ffa81673217",
+                    "mixHash" : "0x01b4b2d8f2b66ca005b57ee3596392487b69e229baca21fd10fbb7bbbea65efa",
+                    "nonce" : "0x5182fde7fd5476a3",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9",
+                    "stateRoot" : "0x20cfa3eb229dd081b22df1167b3a01b8481f478cebb07b4a997079f42ef8686d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe8a06a1ea2afa4c90b4692701212959c4dc629a0fbad641c72d8e05fa7d23d66",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020cfa3eb229dd081b22df1167b3a01b8481f478cebb07b4a997079f42ef8686da0e8a06a1ea2afa4c90b4692701212959c4dc629a0fbad641c72d8e05fa7d23d66a05ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4ab8203e880a001b4b2d8f2b66ca005b57ee3596392487b69e229baca21fd10fbb7bbbea65efa885182fde7fd5476a3f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ba02f396ad8fa1616803615c7adb9006d863f19fe11894362165b01ce1fce6f4e8ea038fb93840ae063ba56693c1099bd546b94bbc3fb0e07c885c351cca8772b039dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f396ad8fa1616803615c7adb9006d863f19fe11894362165b01ce1fce6f4e8e",
+                        "s" : "0x38fb93840ae063ba56693c1099bd546b94bbc3fb0e07c885c351cca8772b039d",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xacc6219a9746dce81c9d64f1feac0833f10376c6639de9e126e31ffa81673217",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0200000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf4ab",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b55",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d17g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g2v0Filler.json",
+            "sourceHash" : "d5e9f68df7b45b6b3e4145e2bb066196122af5f623a1f13b6a5c3f553c0efeb0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0x5cc6d9f258f5bd8311a28d1697c010f020a4f1bf1e878247b714681a812394b3",
+                    "mixHash" : "0xba0a05a9adc038548163d4ced120fa8433ecf48ff4eb752ea5c32f50ef6503de",
+                    "nonce" : "0xc559a26834c31e2e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe8a06a1ea2afa4c90b4692701212959c4dc629a0fbad641c72d8e05fa7d23d66",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a0e8a06a1ea2afa4c90b4692701212959c4dc629a0fbad641c72d8e05fa7d23d66a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a0ba0a05a9adc038548163d4ced120fa8433ecf48ff4eb752ea5c32f50ef6503de88c559a26834c31e2ef8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ba02f396ad8fa1616803615c7adb9006d863f19fe11894362165b01ce1fce6f4e8ea038fb93840ae063ba56693c1099bd546b94bbc3fb0e07c885c351cca8772b039dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f396ad8fa1616803615c7adb9006d863f19fe11894362165b01ce1fce6f4e8e",
+                        "s" : "0x38fb93840ae063ba56693c1099bd546b94bbc3fb0e07c885c351cca8772b039d",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5cc6d9f258f5bd8311a28d1697c010f020a4f1bf1e878247b714681a812394b3",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d17g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g2v0Filler.json",
+            "sourceHash" : "d5e9f68df7b45b6b3e4145e2bb066196122af5f623a1f13b6a5c3f553c0efeb0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0xf20111eb104af6d5cca09096bec40315435a0dce3230316eb354b4af0db3dfc4",
+                    "mixHash" : "0x26e3a89ce7a907e54547ac188218d4a85924ca59817354c7f2ed84c812fdc99d",
+                    "nonce" : "0x4694667288008cb8",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe8a06a1ea2afa4c90b4692701212959c4dc629a0fbad641c72d8e05fa7d23d66",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a0e8a06a1ea2afa4c90b4692701212959c4dc629a0fbad641c72d8e05fa7d23d66a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a026e3a89ce7a907e54547ac188218d4a85924ca59817354c7f2ed84c812fdc99d884694667288008cb8f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ba02f396ad8fa1616803615c7adb9006d863f19fe11894362165b01ce1fce6f4e8ea038fb93840ae063ba56693c1099bd546b94bbc3fb0e07c885c351cca8772b039dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f396ad8fa1616803615c7adb9006d863f19fe11894362165b01ce1fce6f4e8e",
+                        "s" : "0x38fb93840ae063ba56693c1099bd546b94bbc3fb0e07c885c351cca8772b039d",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf20111eb104af6d5cca09096bec40315435a0dce3230316eb354b4af0db3dfc4",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g3v0.json
index 7a73a41bf..973109527 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g3v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d17g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g3v0Filler.json",
+            "sourceHash" : "614abbf3a9b9bedce484e863487df1e46ad0a4ebb4f9a8133ed5ec21daf16c60"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4ab",
+                    "hash" : "0x15ceae713f67a77d0c346e6a13ed0524d049a768001d3a5eb631b6980997ebdf",
+                    "mixHash" : "0x9d0c78a83a318b3ea6292b02c8006f6e4e2cd2d12de054777610779b2b82ddd2",
+                    "nonce" : "0xba5f6f174dc8a2b7",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9",
+                    "stateRoot" : "0x20cfa3eb229dd081b22df1167b3a01b8481f478cebb07b4a997079f42ef8686d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x363f2bfe796b93a0441868e8e66f54a1e65f92a96ce4478bc40cb934797414d9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020cfa3eb229dd081b22df1167b3a01b8481f478cebb07b4a997079f42ef8686da0363f2bfe796b93a0441868e8e66f54a1e65f92a96ce4478bc40cb934797414d9a05ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4ab8203e880a09d0c78a83a318b3ea6292b02c8006f6e4e2cd2d12de054777610779b2b82ddd288ba5f6f174dc8a2b7f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca0c3d123e2ac4b7bdfb7a209c5c45a34e6dbc388eb5e35c6c7401d9be0f1a65149a00cd4cc59ca80475ab244a6386f0843df2b32195bedfbb7556d470101f0394165c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc3d123e2ac4b7bdfb7a209c5c45a34e6dbc388eb5e35c6c7401d9be0f1a65149",
+                        "s" : "0x0cd4cc59ca80475ab244a6386f0843df2b32195bedfbb7556d470101f0394165",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x15ceae713f67a77d0c346e6a13ed0524d049a768001d3a5eb631b6980997ebdf",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0200000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf4ab",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b55",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d17g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g3v0Filler.json",
+            "sourceHash" : "614abbf3a9b9bedce484e863487df1e46ad0a4ebb4f9a8133ed5ec21daf16c60"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0x9dd98c84c632d8eb91eccf72035af2ee1ad9bd0e69a71842b6dedd295fcb3817",
+                    "mixHash" : "0x0317dbcc9d0350590cf4d16e5708e6b02747a804ac88f31e619e9dd3c06de465",
+                    "nonce" : "0xbbed67d588d8e832",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x363f2bfe796b93a0441868e8e66f54a1e65f92a96ce4478bc40cb934797414d9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a0363f2bfe796b93a0441868e8e66f54a1e65f92a96ce4478bc40cb934797414d9a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a00317dbcc9d0350590cf4d16e5708e6b02747a804ac88f31e619e9dd3c06de46588bbed67d588d8e832f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca0c3d123e2ac4b7bdfb7a209c5c45a34e6dbc388eb5e35c6c7401d9be0f1a65149a00cd4cc59ca80475ab244a6386f0843df2b32195bedfbb7556d470101f0394165c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc3d123e2ac4b7bdfb7a209c5c45a34e6dbc388eb5e35c6c7401d9be0f1a65149",
+                        "s" : "0x0cd4cc59ca80475ab244a6386f0843df2b32195bedfbb7556d470101f0394165",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9dd98c84c632d8eb91eccf72035af2ee1ad9bd0e69a71842b6dedd295fcb3817",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d17g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g3v0Filler.json",
+            "sourceHash" : "614abbf3a9b9bedce484e863487df1e46ad0a4ebb4f9a8133ed5ec21daf16c60"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0x4e03c39596d401f520524b32f26fed4cbac4f4b6870649ed088d791988a07af9",
+                    "mixHash" : "0x8e123ece193f9aa183fc6a11bed22c27542ee10d80c0f84cd2caa13323786daf",
+                    "nonce" : "0x494c27da4aadef1a",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x363f2bfe796b93a0441868e8e66f54a1e65f92a96ce4478bc40cb934797414d9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a0363f2bfe796b93a0441868e8e66f54a1e65f92a96ce4478bc40cb934797414d9a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a08e123ece193f9aa183fc6a11bed22c27542ee10d80c0f84cd2caa13323786daf88494c27da4aadef1af8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca0c3d123e2ac4b7bdfb7a209c5c45a34e6dbc388eb5e35c6c7401d9be0f1a65149a00cd4cc59ca80475ab244a6386f0843df2b32195bedfbb7556d470101f0394165c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc3d123e2ac4b7bdfb7a209c5c45a34e6dbc388eb5e35c6c7401d9be0f1a65149",
+                        "s" : "0x0cd4cc59ca80475ab244a6386f0843df2b32195bedfbb7556d470101f0394165",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4e03c39596d401f520524b32f26fed4cbac4f4b6870649ed088d791988a07af9",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g0v0.json
index cafbce9ea..e6a81d01a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d18g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g0v0Filler.json",
             "sourceHash" : "4fd61dcadc5d2b6286e499d3701a1d78a9d633692ec33432772d24c7fd2832df"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0xd0f383e794c5bce634ac7ba9e98dd02ccb9709e54fe0d1502700f798b0e35497",
-                    "mixHash" : "0x0c2ef44198031996f4d004328a7e38bc6e84822b25a24ba55c81a50df05ba652",
-                    "nonce" : "0x12d7539b1671ecc4",
+                    "hash" : "0x8dcbb75dffb1df6462db9eae0296c2b6bebe4bf1d3f248dbce219bb668010589",
+                    "mixHash" : "0x9ba6a101c82fa631431e0ba7a1a4ea57e0f9c926bd8b8da467dedbd7612cbe56",
+                    "nonce" : "0xa06fa5d19759f2ad",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x5c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a00c2ef44198031996f4d004328a7e38bc6e84822b25a24ba55c81a50df05ba6528812d7539b1671ecc4f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a09ba6a101c82fa631431e0ba7a1a4ea57e0f9c926bd8b8da467dedbd7612cbe5688a06fa5d19759f2adf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0f383e794c5bce634ac7ba9e98dd02ccb9709e54fe0d1502700f798b0e35497",
+        "lastblockhash" : "0x8dcbb75dffb1df6462db9eae0296c2b6bebe4bf1d3f248dbce219bb668010589",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d18g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g0v0Filler.json",
             "sourceHash" : "4fd61dcadc5d2b6286e499d3701a1d78a9d633692ec33432772d24c7fd2832df"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0x4be71124bce4e16ad276469ce9fb6ce1fa4d1621391142ba82f080b5f87814f0",
-                    "mixHash" : "0x74e0f8c86ae3a9bbd4e955d25aeedbc0bf3d1ee35d485fba8789b04ccf053c43",
-                    "nonce" : "0x66967c39ae700a78",
+                    "hash" : "0x7694bc02a70f62ceaa7ae1374444d68c24d876b663bfcb1b0824ad33b05d5d1e",
+                    "mixHash" : "0xfbb9b131c6d299a22dab6ad7686e887534ff4ebe0632f2a21bf491863c02a81e",
+                    "nonce" : "0xc7a901b6c7e4b6bb",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0x5c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a074e0f8c86ae3a9bbd4e955d25aeedbc0bf3d1ee35d485fba8789b04ccf053c438866967c39ae700a78f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0fbb9b131c6d299a22dab6ad7686e887534ff4ebe0632f2a21bf491863c02a81e88c7a901b6c7e4b6bbf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4be71124bce4e16ad276469ce9fb6ce1fa4d1621391142ba82f080b5f87814f0",
+        "lastblockhash" : "0x7694bc02a70f62ceaa7ae1374444d68c24d876b663bfcb1b0824ad33b05d5d1e",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d18g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g0v0Filler.json",
             "sourceHash" : "4fd61dcadc5d2b6286e499d3701a1d78a9d633692ec33432772d24c7fd2832df"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0x754a1d1f0d90e09a87219b8329dce7b33e0add83eefa9e70439da091f48e823e",
-                    "mixHash" : "0xaddaec6debc1e522ed3c4329aa9944a1ce2b1438d400a865040ff40d90273356",
-                    "nonce" : "0xacc05682b2840263",
+                    "hash" : "0x0b3c3f5c85872018d9da9531398f37f3c9c090b4085b3bf578370ece09835923",
+                    "mixHash" : "0x2de17e956f2f8ea41e34cd6103942fdc6433e43115b3ec5c09b28d1629d3294d",
+                    "nonce" : "0x331ffa26af73c2fb",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0x5c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0addaec6debc1e522ed3c4329aa9944a1ce2b1438d400a865040ff40d9027335688acc05682b2840263f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a02de17e956f2f8ea41e34cd6103942fdc6433e43115b3ec5c09b28d1629d3294d88331ffa26af73c2fbf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x754a1d1f0d90e09a87219b8329dce7b33e0add83eefa9e70439da091f48e823e",
+        "lastblockhash" : "0x0b3c3f5c85872018d9da9531398f37f3c9c090b4085b3bf578370ece09835923",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g1v0.json
index 7a73a41bf..df3fb2db2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d18g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g1v0Filler.json",
+            "sourceHash" : "de456422e98cfb681c18aa2db84bd009bd59b2878e082522768f77b63a923cf7"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x0939c0965c5fd643164731fd9ba08dad40bf6df5c3fe8d14d30f30931b6e8c99",
+                    "mixHash" : "0x1ac3e76e33a7644d9682725187e32639a6f4757d3041a6dafaea416f2e2eb16a",
+                    "nonce" : "0x194175d3554fd197",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0xf3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc42c3c6c774481a3fa1a6f9e06677b33fb38cda001961f419619fd1c392321e4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa0c42c3c6c774481a3fa1a6f9e06677b33fb38cda001961f419619fd1c392321e4a052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a01ac3e76e33a7644d9682725187e32639a6f4757d3041a6dafaea416f2e2eb16a88194175d3554fd197f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca09d4bf33ee0fb70fc1b3f3c6d4e215b3df601e1baaf5e1c5607729684fba07a50a01d58f58d90fc0553688105c4155e8fd5c812efe4c2bbad947d27ad1300fa94e9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d4bf33ee0fb70fc1b3f3c6d4e215b3df601e1baaf5e1c5607729684fba07a50",
+                        "s" : "0x1d58f58d90fc0553688105c4155e8fd5c812efe4c2bbad947d27ad1300fa94e9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0939c0965c5fd643164731fd9ba08dad40bf6df5c3fe8d14d30f30931b6e8c99",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d18g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g1v0Filler.json",
+            "sourceHash" : "de456422e98cfb681c18aa2db84bd009bd59b2878e082522768f77b63a923cf7"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x748f10965a187361af23488b93148e4b7da72217df91ab9e8af826f35e3a7b82",
+                    "mixHash" : "0x7db86a5a47aca77bd0cda2794a0393676037db8ca22a0599dfbcced4d41b9e07",
+                    "nonce" : "0xf8a3e8ef5d2029ab",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc42c3c6c774481a3fa1a6f9e06677b33fb38cda001961f419619fd1c392321e4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0c42c3c6c774481a3fa1a6f9e06677b33fb38cda001961f419619fd1c392321e4a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a07db86a5a47aca77bd0cda2794a0393676037db8ca22a0599dfbcced4d41b9e0788f8a3e8ef5d2029abf8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca09d4bf33ee0fb70fc1b3f3c6d4e215b3df601e1baaf5e1c5607729684fba07a50a01d58f58d90fc0553688105c4155e8fd5c812efe4c2bbad947d27ad1300fa94e9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d4bf33ee0fb70fc1b3f3c6d4e215b3df601e1baaf5e1c5607729684fba07a50",
+                        "s" : "0x1d58f58d90fc0553688105c4155e8fd5c812efe4c2bbad947d27ad1300fa94e9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x748f10965a187361af23488b93148e4b7da72217df91ab9e8af826f35e3a7b82",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d18g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g1v0Filler.json",
+            "sourceHash" : "de456422e98cfb681c18aa2db84bd009bd59b2878e082522768f77b63a923cf7"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x8c8f5ae276d59d79fe3621a0113258fc77db798dfbe57a9452f2d87c9a6c06c3",
+                    "mixHash" : "0x89bdaa2be980468d1a670ae00044e42ed0a176eef3472e27c3ffbc396f8dcaf6",
+                    "nonce" : "0x9fa74d56456e1b92",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc42c3c6c774481a3fa1a6f9e06677b33fb38cda001961f419619fd1c392321e4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0c42c3c6c774481a3fa1a6f9e06677b33fb38cda001961f419619fd1c392321e4a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a089bdaa2be980468d1a670ae00044e42ed0a176eef3472e27c3ffbc396f8dcaf6889fa74d56456e1b92f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca09d4bf33ee0fb70fc1b3f3c6d4e215b3df601e1baaf5e1c5607729684fba07a50a01d58f58d90fc0553688105c4155e8fd5c812efe4c2bbad947d27ad1300fa94e9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d4bf33ee0fb70fc1b3f3c6d4e215b3df601e1baaf5e1c5607729684fba07a50",
+                        "s" : "0x1d58f58d90fc0553688105c4155e8fd5c812efe4c2bbad947d27ad1300fa94e9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8c8f5ae276d59d79fe3621a0113258fc77db798dfbe57a9452f2d87c9a6c06c3",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g2v0.json
index 7a73a41bf..721b4d6be 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d18g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g2v0Filler.json",
+            "sourceHash" : "758b72a2d22428aca755b238868c377239c2deb4f3166775a85d164f574b7e3f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x1bf531b00824e3ba3ea3dff32f77fdfa332b460f833aa06f4b7aec1d0a795c14",
+                    "mixHash" : "0xf9bc2f15761e3ce5a5a0bc4bf44a8811d5f3f5a7e536169f40310232a47c2ce1",
+                    "nonce" : "0xe9971e9faf417da7",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0xf3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdd32fd225d62c80ec710b42c78c14c55ccaafbeeb50586deeba8786565974f54",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa0dd32fd225d62c80ec710b42c78c14c55ccaafbeeb50586deeba8786565974f54a052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0f9bc2f15761e3ce5a5a0bc4bf44a8811d5f3f5a7e536169f40310232a47c2ce188e9971e9faf417da7f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ba0f68bc20ebde4c30b902d1d26d1277ae36f802aaeac78940d81842bc101a361c8a078d53657b18bc9f294dc75cbaa15ce9a9cf000bf881a606fe3110fac551c578ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf68bc20ebde4c30b902d1d26d1277ae36f802aaeac78940d81842bc101a361c8",
+                        "s" : "0x78d53657b18bc9f294dc75cbaa15ce9a9cf000bf881a606fe3110fac551c578a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1bf531b00824e3ba3ea3dff32f77fdfa332b460f833aa06f4b7aec1d0a795c14",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d18g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g2v0Filler.json",
+            "sourceHash" : "758b72a2d22428aca755b238868c377239c2deb4f3166775a85d164f574b7e3f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xec51cc13799c8cb7a0f4ea44c44cb085f07e55b7ab3ff3649ff20ff56f8b1683",
+                    "mixHash" : "0xa381cfef4cd8c417d1d589ac2e88d85dc3f9b493fface0b6b1e6c94d59d59d71",
+                    "nonce" : "0xd9ef290987bbd152",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdd32fd225d62c80ec710b42c78c14c55ccaafbeeb50586deeba8786565974f54",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0dd32fd225d62c80ec710b42c78c14c55ccaafbeeb50586deeba8786565974f54a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0a381cfef4cd8c417d1d589ac2e88d85dc3f9b493fface0b6b1e6c94d59d59d7188d9ef290987bbd152f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ba0f68bc20ebde4c30b902d1d26d1277ae36f802aaeac78940d81842bc101a361c8a078d53657b18bc9f294dc75cbaa15ce9a9cf000bf881a606fe3110fac551c578ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf68bc20ebde4c30b902d1d26d1277ae36f802aaeac78940d81842bc101a361c8",
+                        "s" : "0x78d53657b18bc9f294dc75cbaa15ce9a9cf000bf881a606fe3110fac551c578a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xec51cc13799c8cb7a0f4ea44c44cb085f07e55b7ab3ff3649ff20ff56f8b1683",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d18g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g2v0Filler.json",
+            "sourceHash" : "758b72a2d22428aca755b238868c377239c2deb4f3166775a85d164f574b7e3f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xdf13a9517463a48c35e623eb3cfd5c1fb7ade629503029e73a721fb3cc4d97ad",
+                    "mixHash" : "0xd992650143ed4b6f58fd2a1ede21a6038b72747a9a7b21347227a03d939a5ace",
+                    "nonce" : "0x53dca74c24ce45be",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdd32fd225d62c80ec710b42c78c14c55ccaafbeeb50586deeba8786565974f54",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0dd32fd225d62c80ec710b42c78c14c55ccaafbeeb50586deeba8786565974f54a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0d992650143ed4b6f58fd2a1ede21a6038b72747a9a7b21347227a03d939a5ace8853dca74c24ce45bef8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ba0f68bc20ebde4c30b902d1d26d1277ae36f802aaeac78940d81842bc101a361c8a078d53657b18bc9f294dc75cbaa15ce9a9cf000bf881a606fe3110fac551c578ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf68bc20ebde4c30b902d1d26d1277ae36f802aaeac78940d81842bc101a361c8",
+                        "s" : "0x78d53657b18bc9f294dc75cbaa15ce9a9cf000bf881a606fe3110fac551c578a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdf13a9517463a48c35e623eb3cfd5c1fb7ade629503029e73a721fb3cc4d97ad",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g3v0.json
index 7a73a41bf..621c4cf5c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d18g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g3v0Filler.json",
+            "sourceHash" : "978a7194818aa2c86784744292a8e3845525c1d096cf8a3007a7bcba696311bd"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xe622ae7a92492ece8ee5788acfa38cda90d1653a8ee6921fac37fccb2f19c5d5",
+                    "mixHash" : "0x71ed3fbd4ad3ab7f7f475c3e1ad5298a0d63037afdfd632d4d9786f483358740",
+                    "nonce" : "0x33ca83cf9eba0e6d",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0xf3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf4d4898eebbd724bfd13d946dfe376b6bfe24998b6b3367e8af06bfe266c59e0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3ea25326493a66734d45114dfdc835ecb5ae077f9d321a3a2c495bb8614d6ffa0f4d4898eebbd724bfd13d946dfe376b6bfe24998b6b3367e8af06bfe266c59e0a052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a071ed3fbd4ad3ab7f7f475c3e1ad5298a0d63037afdfd632d4d9786f4833587408833ca83cf9eba0e6df8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca040f1b2d61cfed328a3d4f353a3aef18f7fcc1c7d5e2a3781d1b143b1b04e81dba0572afe4492020bc16424db1be850bd9a2b7563dfc97fd7d0094b94cb8baca21fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40f1b2d61cfed328a3d4f353a3aef18f7fcc1c7d5e2a3781d1b143b1b04e81db",
+                        "s" : "0x572afe4492020bc16424db1be850bd9a2b7563dfc97fd7d0094b94cb8baca21f",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe622ae7a92492ece8ee5788acfa38cda90d1653a8ee6921fac37fccb2f19c5d5",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d18g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g3v0Filler.json",
+            "sourceHash" : "978a7194818aa2c86784744292a8e3845525c1d096cf8a3007a7bcba696311bd"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xc56c2c65b12222cc421fbaa91cccfb949528c7d69498486917b3838d898b1307",
+                    "mixHash" : "0x3db16401be9f756086925ff0c09e7ec565dc174165677480022b5eeb7e2c5137",
+                    "nonce" : "0x7e83d033676bb636",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf4d4898eebbd724bfd13d946dfe376b6bfe24998b6b3367e8af06bfe266c59e0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0f4d4898eebbd724bfd13d946dfe376b6bfe24998b6b3367e8af06bfe266c59e0a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a03db16401be9f756086925ff0c09e7ec565dc174165677480022b5eeb7e2c5137887e83d033676bb636f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca040f1b2d61cfed328a3d4f353a3aef18f7fcc1c7d5e2a3781d1b143b1b04e81dba0572afe4492020bc16424db1be850bd9a2b7563dfc97fd7d0094b94cb8baca21fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40f1b2d61cfed328a3d4f353a3aef18f7fcc1c7d5e2a3781d1b143b1b04e81db",
+                        "s" : "0x572afe4492020bc16424db1be850bd9a2b7563dfc97fd7d0094b94cb8baca21f",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc56c2c65b12222cc421fbaa91cccfb949528c7d69498486917b3838d898b1307",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d18g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g3v0Filler.json",
+            "sourceHash" : "978a7194818aa2c86784744292a8e3845525c1d096cf8a3007a7bcba696311bd"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xc971a2ed515a246b2d074c34217418ed26b4655aee7fa067d20bfcb3eab4ea5c",
+                    "mixHash" : "0x8bb9998bbb8123446b4d5e3d602748aa3b0273136093c13d377e4648eda0b790",
+                    "nonce" : "0x9c33f11c370a3429",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf4d4898eebbd724bfd13d946dfe376b6bfe24998b6b3367e8af06bfe266c59e0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a0f4d4898eebbd724bfd13d946dfe376b6bfe24998b6b3367e8af06bfe266c59e0a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a08bb9998bbb8123446b4d5e3d602748aa3b0273136093c13d377e4648eda0b790889c33f11c370a3429f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca040f1b2d61cfed328a3d4f353a3aef18f7fcc1c7d5e2a3781d1b143b1b04e81dba0572afe4492020bc16424db1be850bd9a2b7563dfc97fd7d0094b94cb8baca21fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40f1b2d61cfed328a3d4f353a3aef18f7fcc1c7d5e2a3781d1b143b1b04e81db",
+                        "s" : "0x572afe4492020bc16424db1be850bd9a2b7563dfc97fd7d0094b94cb8baca21f",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc971a2ed515a246b2d074c34217418ed26b4655aee7fa067d20bfcb3eab4ea5c",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g0v0.json
index 9f32779b1..fed7f5888 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d19g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g0v0Filler.json",
             "sourceHash" : "a272f0a4541d200e381e5dad245cea035967e9e300b7069b82fcf0d7eef07555"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d7",
-                    "hash" : "0x5eaac17df0f647cb74dc84feaa928a51f4c6cba5a33dd6130e3ea108ef466c20",
-                    "mixHash" : "0xad659e67347491607e45a201a6887c8c8105ad47e23e03e9b4947a0c9bfddd52",
-                    "nonce" : "0x699a6a8d3a67c380",
+                    "hash" : "0x9a354d5832cdd992a9d2e288633ffbe4b97ae042d762eb73a6366f877d9ee7de",
+                    "mixHash" : "0x0102cc983e156b6ad27fe6483cc6c6c67fbd58f6301379ef3cc269f74d90d593",
+                    "nonce" : "0x441ed62a02c0957d",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636ae",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xc503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b48a0707e144d23d99141bea56b6ed420bde9c61f00a45bd76e40bad97167fcda0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a0541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636aeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a0ad659e67347491607e45a201a6887c8c8105ad47e23e03e9b4947a0c9bfddd5288699a6a8d3a67c380f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b48a0707e144d23d99141bea56b6ed420bde9c61f00a45bd76e40bad97167fcda0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a0541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636aeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a00102cc983e156b6ad27fe6483cc6c6c67fbd58f6301379ef3cc269f74d90d59388441ed62a02c0957df8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5eaac17df0f647cb74dc84feaa928a51f4c6cba5a33dd6130e3ea108ef466c20",
+        "lastblockhash" : "0x9a354d5832cdd992a9d2e288633ffbe4b97ae042d762eb73a6366f877d9ee7de",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d19g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g0v0Filler.json",
             "sourceHash" : "a272f0a4541d200e381e5dad245cea035967e9e300b7069b82fcf0d7eef07555"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d7",
-                    "hash" : "0xb11711bfd32a2023054c23175745f165ac2bb2d59d0f8896558608f937976f19",
-                    "mixHash" : "0xddc3accad0760656aded324b65f5f21e5defae32e0a4be61db0eb96ad8488211",
-                    "nonce" : "0x7d29ef795d69bfe4",
+                    "hash" : "0xdf7abb913224f7e3cf7c8edbe9ca1084282eeb981fbe320499a884257d5770d4",
+                    "mixHash" : "0x4cef9c86017856a5ff00e4e05290a291a75c929c85967d85d72a783a934786c7",
+                    "nonce" : "0xb3871e1e353a58d8",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x54726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceaf",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0xc503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a0ddc3accad0760656aded324b65f5f21e5defae32e0a4be61db0eb96ad8488211887d29ef795d69bfe4f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a04cef9c86017856a5ff00e4e05290a291a75c929c85967d85d72a783a934786c788b3871e1e353a58d8f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb11711bfd32a2023054c23175745f165ac2bb2d59d0f8896558608f937976f19",
+        "lastblockhash" : "0xdf7abb913224f7e3cf7c8edbe9ca1084282eeb981fbe320499a884257d5770d4",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d19g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g0v0Filler.json",
             "sourceHash" : "a272f0a4541d200e381e5dad245cea035967e9e300b7069b82fcf0d7eef07555"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d7",
-                    "hash" : "0xbc83dd27af79dce4c1cbf02b488071c30327b92775fadeeb0ab9c6518184d867",
-                    "mixHash" : "0x21563e9c361a1248bfc6be6b05f85f36fa0937a85ab5e5f4174407ea19377506",
-                    "nonce" : "0x2fd3c34b99dd2611",
+                    "hash" : "0x24f1d50ca05b4a012bddbd71837325a87da8cd0fb702d5884cc1bbdb9897d019",
+                    "mixHash" : "0xbd4902a009b8dd1cb6bc09be8e66a39fe39bda12dfadfd37382defe30ca8e431",
+                    "nonce" : "0xa1d2f80828ec09ab",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x54726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceaf",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0xc503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a021563e9c361a1248bfc6be6b05f85f36fa0937a85ab5e5f4174407ea19377506882fd3c34b99dd2611f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a0bd4902a009b8dd1cb6bc09be8e66a39fe39bda12dfadfd37382defe30ca8e43188a1d2f80828ec09abf8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc83dd27af79dce4c1cbf02b488071c30327b92775fadeeb0ab9c6518184d867",
+        "lastblockhash" : "0x24f1d50ca05b4a012bddbd71837325a87da8cd0fb702d5884cc1bbdb9897d019",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g1v0.json
index 7a73a41bf..4beb5428c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d19g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g1v0Filler.json",
+            "sourceHash" : "17b705c81749cdff3f3f83bed0d03b0a5ac2e77765c24364fe79aed7dbf02299"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d7",
+                    "hash" : "0x5b476e0e5dc99a9aad572031b68cd7a6f9c6db9c4ff5c572b297ba60b5b250f0",
+                    "mixHash" : "0x1a13da096961a4fa2c8ec9f30622ef0120b8b6ecf74c13446ed7800e981c38a8",
+                    "nonce" : "0x94c42a6894b493fe",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636ae",
+                    "stateRoot" : "0xb48a0707e144d23d99141bea56b6ed420bde9c61f00a45bd76e40bad97167fcd",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa31e90a7a1e192b30bfc66e027afc8c8df6707236f4ca8daad30e8ef105f6143",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b48a0707e144d23d99141bea56b6ed420bde9c61f00a45bd76e40bad97167fcda0a31e90a7a1e192b30bfc66e027afc8c8df6707236f4ca8daad30e8ef105f6143a0541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636aeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a01a13da096961a4fa2c8ec9f30622ef0120b8b6ecf74c13446ed7800e981c38a88894c42a6894b493fef8c7f8c5800183015f9094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca087a0621df1748376cd5f22fa7e1cf0d736355b773dfc57e919be047842abbfa5a06d7e46642a1446fe146530d584180b4cf9e931166daa796043ce468d7915a6d7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x87a0621df1748376cd5f22fa7e1cf0d736355b773dfc57e919be047842abbfa5",
+                        "s" : "0x6d7e46642a1446fe146530d584180b4cf9e931166daa796043ce468d7915a6d7",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5b476e0e5dc99a9aad572031b68cd7a6f9c6db9c4ff5c572b297ba60b5b250f0",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4629",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d19g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g1v0Filler.json",
+            "sourceHash" : "17b705c81749cdff3f3f83bed0d03b0a5ac2e77765c24364fe79aed7dbf02299"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d7",
+                    "hash" : "0xd604fa832d700111fd8571b7864478ff167dacd7ec55a6961f884feb182202a9",
+                    "mixHash" : "0x61234319e08b86309edf3061f8441aca77edb6af107621f716297c94328befa0",
+                    "nonce" : "0x08dfcc0463b4b22e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x54726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceaf",
+                    "stateRoot" : "0xa7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa31e90a7a1e192b30bfc66e027afc8c8df6707236f4ca8daad30e8ef105f6143",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0a31e90a7a1e192b30bfc66e027afc8c8df6707236f4ca8daad30e8ef105f6143a054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a061234319e08b86309edf3061f8441aca77edb6af107621f716297c94328befa08808dfcc0463b4b22ef8c7f8c5800183015f9094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca087a0621df1748376cd5f22fa7e1cf0d736355b773dfc57e919be047842abbfa5a06d7e46642a1446fe146530d584180b4cf9e931166daa796043ce468d7915a6d7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x87a0621df1748376cd5f22fa7e1cf0d736355b773dfc57e919be047842abbfa5",
+                        "s" : "0x6d7e46642a1446fe146530d584180b4cf9e931166daa796043ce468d7915a6d7",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd604fa832d700111fd8571b7864478ff167dacd7ec55a6961f884feb182202a9",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4629",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d19g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g1v0Filler.json",
+            "sourceHash" : "17b705c81749cdff3f3f83bed0d03b0a5ac2e77765c24364fe79aed7dbf02299"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d7",
+                    "hash" : "0x70d8983264bc548c9c3cfa93b93512e3c9d2693ef70cf9d35ff1cec3e34d55cc",
+                    "mixHash" : "0x629b63610fa7e65a74cc60285221d03683eb855f49e57073e48e5b8196fdf8b0",
+                    "nonce" : "0x550a887f3af6e7ea",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x54726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceaf",
+                    "stateRoot" : "0xa7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa31e90a7a1e192b30bfc66e027afc8c8df6707236f4ca8daad30e8ef105f6143",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0a31e90a7a1e192b30bfc66e027afc8c8df6707236f4ca8daad30e8ef105f6143a054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a0629b63610fa7e65a74cc60285221d03683eb855f49e57073e48e5b8196fdf8b088550a887f3af6e7eaf8c7f8c5800183015f9094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca087a0621df1748376cd5f22fa7e1cf0d736355b773dfc57e919be047842abbfa5a06d7e46642a1446fe146530d584180b4cf9e931166daa796043ce468d7915a6d7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x87a0621df1748376cd5f22fa7e1cf0d736355b773dfc57e919be047842abbfa5",
+                        "s" : "0x6d7e46642a1446fe146530d584180b4cf9e931166daa796043ce468d7915a6d7",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x70d8983264bc548c9c3cfa93b93512e3c9d2693ef70cf9d35ff1cec3e34d55cc",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4629",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g2v0.json
index 7a73a41bf..b0741e781 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d19g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g2v0Filler.json",
+            "sourceHash" : "08f768c3ef24a8a1e0597b0bec7076e17f4e6501167e27d852ed3be635ce24f9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d7",
+                    "hash" : "0x9d3b53a65ddcca2cfe623788f6f1ee18e9f4f170a598db9117c2d1f71eb75871",
+                    "mixHash" : "0x13472375a77319724d7286ac1feeb8c15770bfcc5e154d3010ff31786cdf3334",
+                    "nonce" : "0x82ef8e6f0843fb0a",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636ae",
+                    "stateRoot" : "0xb48a0707e144d23d99141bea56b6ed420bde9c61f00a45bd76e40bad97167fcd",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb132c042c78e278d10df6ce81148564581a54f922b3a883ae3e41db0a1d2471e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b48a0707e144d23d99141bea56b6ed420bde9c61f00a45bd76e40bad97167fcda0b132c042c78e278d10df6ce81148564581a54f922b3a883ae3e41db0a1d2471ea0541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636aeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a013472375a77319724d7286ac1feeb8c15770bfcc5e154d3010ff31786cdf33348882ef8e6f0843fb0af8c7f8c580018301adb094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0d42d5d6ca5e01fb5fd84e86087bdb97396cf8118090cb0f95de98c8aeec9c36ca06fe3fb41ef4da142f8c7d508fde2cd85455bded8431d6d13b4338f80253acab6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd42d5d6ca5e01fb5fd84e86087bdb97396cf8118090cb0f95de98c8aeec9c36c",
+                        "s" : "0x6fe3fb41ef4da142f8c7d508fde2cd85455bded8431d6d13b4338f80253acab6",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9d3b53a65ddcca2cfe623788f6f1ee18e9f4f170a598db9117c2d1f71eb75871",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4629",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d19g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g2v0Filler.json",
+            "sourceHash" : "08f768c3ef24a8a1e0597b0bec7076e17f4e6501167e27d852ed3be635ce24f9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d7",
+                    "hash" : "0xf02035869c2bee8984da548e18fa686d540a087216227ae49bd0753e71876f8e",
+                    "mixHash" : "0xc8ab458471758c1286bdcdba28064a3ebc9b0e731282e90ae8dc0c868e2fcc03",
+                    "nonce" : "0x1eec0aa084a2f677",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x54726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceaf",
+                    "stateRoot" : "0xa7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb132c042c78e278d10df6ce81148564581a54f922b3a883ae3e41db0a1d2471e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0b132c042c78e278d10df6ce81148564581a54f922b3a883ae3e41db0a1d2471ea054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a0c8ab458471758c1286bdcdba28064a3ebc9b0e731282e90ae8dc0c868e2fcc03881eec0aa084a2f677f8c7f8c580018301adb094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0d42d5d6ca5e01fb5fd84e86087bdb97396cf8118090cb0f95de98c8aeec9c36ca06fe3fb41ef4da142f8c7d508fde2cd85455bded8431d6d13b4338f80253acab6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd42d5d6ca5e01fb5fd84e86087bdb97396cf8118090cb0f95de98c8aeec9c36c",
+                        "s" : "0x6fe3fb41ef4da142f8c7d508fde2cd85455bded8431d6d13b4338f80253acab6",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf02035869c2bee8984da548e18fa686d540a087216227ae49bd0753e71876f8e",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4629",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d19g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g2v0Filler.json",
+            "sourceHash" : "08f768c3ef24a8a1e0597b0bec7076e17f4e6501167e27d852ed3be635ce24f9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d7",
+                    "hash" : "0x2ce8193b95b6b9ba42d44a10a02ac0dbb71def2583e7136e2be2f5c675394af0",
+                    "mixHash" : "0x4705f9324c1d25bc4d66c4d3ed8ef173bf053055083b993b3813409d919ea3c7",
+                    "nonce" : "0xbe8a7561c578e3ea",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x54726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceaf",
+                    "stateRoot" : "0xa7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb132c042c78e278d10df6ce81148564581a54f922b3a883ae3e41db0a1d2471e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0b132c042c78e278d10df6ce81148564581a54f922b3a883ae3e41db0a1d2471ea054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a04705f9324c1d25bc4d66c4d3ed8ef173bf053055083b993b3813409d919ea3c788be8a7561c578e3eaf8c7f8c580018301adb094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0d42d5d6ca5e01fb5fd84e86087bdb97396cf8118090cb0f95de98c8aeec9c36ca06fe3fb41ef4da142f8c7d508fde2cd85455bded8431d6d13b4338f80253acab6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd42d5d6ca5e01fb5fd84e86087bdb97396cf8118090cb0f95de98c8aeec9c36c",
+                        "s" : "0x6fe3fb41ef4da142f8c7d508fde2cd85455bded8431d6d13b4338f80253acab6",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2ce8193b95b6b9ba42d44a10a02ac0dbb71def2583e7136e2be2f5c675394af0",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4629",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g3v0.json
index 7a73a41bf..91f610e9d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d19g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g3v0Filler.json",
+            "sourceHash" : "29ffd5916917246c9c50ca738131bcf71e4e8562e377fba65cc7d6193f7d2953"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d7",
+                    "hash" : "0xe2e9de7b78fdd3bec883603603e9015f137badb530123e23176abca84abb35ab",
+                    "mixHash" : "0x9ddb7e6441a29d02c8b557a75daa65fd4172543b921e5c23e065ea66fb79f356",
+                    "nonce" : "0xbcab31184de9bfbd",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636ae",
+                    "stateRoot" : "0xb48a0707e144d23d99141bea56b6ed420bde9c61f00a45bd76e40bad97167fcd",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf5b9c69908ac8cae26ab8a9e5c32b91bbbac888441f8a0bb21f6f048a22e9042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b48a0707e144d23d99141bea56b6ed420bde9c61f00a45bd76e40bad97167fcda0f5b9c69908ac8cae26ab8a9e5c32b91bbbac888441f8a0bb21f6f048a22e9042a0541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636aeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a09ddb7e6441a29d02c8b557a75daa65fd4172543b921e5c23e065ea66fb79f35688bcab31184de9bfbdf8c7f8c5800183030d4094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca039c8fbce82d9f556592f57e9a0b06b31ae44882b8212ed3112732262f76a65d5a00f3b9f6f2e719b9d43411170fcc472c776569f9e52ebc9b4728a07b9b46a4cdec0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x39c8fbce82d9f556592f57e9a0b06b31ae44882b8212ed3112732262f76a65d5",
+                        "s" : "0x0f3b9f6f2e719b9d43411170fcc472c776569f9e52ebc9b4728a07b9b46a4cde",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe2e9de7b78fdd3bec883603603e9015f137badb530123e23176abca84abb35ab",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4629",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d19g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g3v0Filler.json",
+            "sourceHash" : "29ffd5916917246c9c50ca738131bcf71e4e8562e377fba65cc7d6193f7d2953"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d7",
+                    "hash" : "0x8541432c6f2456ed73c62cd06ecb295aa1c0833a19d91031d7270662b78231a4",
+                    "mixHash" : "0x388dc7e388b171e4c2b1f9f30b594577064f0e24bf37aefea0d6b73b45bf4a28",
+                    "nonce" : "0x95958cf9e5e2c354",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x54726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceaf",
+                    "stateRoot" : "0xa7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf5b9c69908ac8cae26ab8a9e5c32b91bbbac888441f8a0bb21f6f048a22e9042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0f5b9c69908ac8cae26ab8a9e5c32b91bbbac888441f8a0bb21f6f048a22e9042a054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a0388dc7e388b171e4c2b1f9f30b594577064f0e24bf37aefea0d6b73b45bf4a288895958cf9e5e2c354f8c7f8c5800183030d4094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca039c8fbce82d9f556592f57e9a0b06b31ae44882b8212ed3112732262f76a65d5a00f3b9f6f2e719b9d43411170fcc472c776569f9e52ebc9b4728a07b9b46a4cdec0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x39c8fbce82d9f556592f57e9a0b06b31ae44882b8212ed3112732262f76a65d5",
+                        "s" : "0x0f3b9f6f2e719b9d43411170fcc472c776569f9e52ebc9b4728a07b9b46a4cde",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8541432c6f2456ed73c62cd06ecb295aa1c0833a19d91031d7270662b78231a4",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4629",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d19g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g3v0Filler.json",
+            "sourceHash" : "29ffd5916917246c9c50ca738131bcf71e4e8562e377fba65cc7d6193f7d2953"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d7",
+                    "hash" : "0x13c12797bbbc9249dcdf8c9e5d01f6ce9b611243745fdd53a761599bd3084d39",
+                    "mixHash" : "0x6e04c7a63f483d355dea31652037ba23727d5a94f687bf5f53649be2dead64de",
+                    "nonce" : "0x7d41fe486a440e26",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x54726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceaf",
+                    "stateRoot" : "0xa7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf5b9c69908ac8cae26ab8a9e5c32b91bbbac888441f8a0bb21f6f048a22e9042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0f5b9c69908ac8cae26ab8a9e5c32b91bbbac888441f8a0bb21f6f048a22e9042a054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a06e04c7a63f483d355dea31652037ba23727d5a94f687bf5f53649be2dead64de887d41fe486a440e26f8c7f8c5800183030d4094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca039c8fbce82d9f556592f57e9a0b06b31ae44882b8212ed3112732262f76a65d5a00f3b9f6f2e719b9d43411170fcc472c776569f9e52ebc9b4728a07b9b46a4cdec0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x39c8fbce82d9f556592f57e9a0b06b31ae44882b8212ed3112732262f76a65d5",
+                        "s" : "0x0f3b9f6f2e719b9d43411170fcc472c776569f9e52ebc9b4728a07b9b46a4cde",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x13c12797bbbc9249dcdf8c9e5d01f6ce9b611243745fdd53a761599bd3084d39",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4629",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g0v0.json
index fa4cf237d..dfab9672d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g0v0Filler.json",
             "sourceHash" : "00b931b3bb147ce843c31b47282977c73c2644cd58f75fd2e1dff2d6214a2c1f"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xfd0a",
-                    "hash" : "0xcf6bd1ca3e7d73f3b0344a3848c0d00c2087f282daff79a41c2e050cf5de889c",
-                    "mixHash" : "0x21ff044198bb362c42db2c65a25aaa21b564bae4ebc64d417abbd4baa83447ee",
-                    "nonce" : "0xd55d6e487a9a53a6",
+                    "hash" : "0x39bfd6f681d26327ef79cea05e4902eecd3be1862277c77c0ff0168baacdd0ab",
+                    "mixHash" : "0xc9cddca643440fd439532a4e00f48ce6acb822b7b610c6cdedbd56f8e0fd9bc9",
+                    "nonce" : "0x252dae61f46fcffd",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xe1f20f5f5099b2ad06e03c9619c575c7db2fefeb4d80f0cb103224f59c65a3e0",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xb34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0091ede07f617c91f5c64f68c15b467e91c9475707e8e63d8d1dc7b7602a9143ba0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a0e1f20f5f5099b2ad06e03c9619c575c7db2fefeb4d80f0cb103224f59c65a3e0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fd0a8203e880a021ff044198bb362c42db2c65a25aaa21b564bae4ebc64d417abbd4baa83447ee88d55d6e487a9a53a6f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0091ede07f617c91f5c64f68c15b467e91c9475707e8e63d8d1dc7b7602a9143ba0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a0e1f20f5f5099b2ad06e03c9619c575c7db2fefeb4d80f0cb103224f59c65a3e0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fd0a8203e880a0c9cddca643440fd439532a4e00f48ce6acb822b7b610c6cdedbd56f8e0fd9bc988252dae61f46fcffdf90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf6bd1ca3e7d73f3b0344a3848c0d00c2087f282daff79a41c2e050cf5de889c",
+        "lastblockhash" : "0x39bfd6f681d26327ef79cea05e4902eecd3be1862277c77c0ff0168baacdd0ab",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d1g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g0v0Filler.json",
             "sourceHash" : "00b931b3bb147ce843c31b47282977c73c2644cd58f75fd2e1dff2d6214a2c1f"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xca0a",
-                    "hash" : "0x60ca5bba055e8134138be8eb688d2fda1ece754036e085200baed95fa98edea9",
-                    "mixHash" : "0xbe0206e7c32320713d8e8b51526920440ca89748ab1877abcdff7aeba93dac34",
-                    "nonce" : "0x4976feaecc01df37",
+                    "hash" : "0x7cc58362ffed475fe636ecb5283ae3a0cc004c3f34f442ec48e7b44263778fa7",
+                    "mixHash" : "0xf1047db93bffb6fe1f6f7fe8590632e5cf43ad7b6ef130f8c147172215784e9e",
+                    "nonce" : "0xb9a20cabd3e75f65",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x6579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcd",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0xb34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a0be0206e7c32320713d8e8b51526920440ca89748ab1877abcdff7aeba93dac34884976feaecc01df37f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a0f1047db93bffb6fe1f6f7fe8590632e5cf43ad7b6ef130f8c147172215784e9e88b9a20cabd3e75f65f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x60ca5bba055e8134138be8eb688d2fda1ece754036e085200baed95fa98edea9",
+        "lastblockhash" : "0x7cc58362ffed475fe636ecb5283ae3a0cc004c3f34f442ec48e7b44263778fa7",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g0v0Filler.json",
             "sourceHash" : "00b931b3bb147ce843c31b47282977c73c2644cd58f75fd2e1dff2d6214a2c1f"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xca0a",
-                    "hash" : "0x901b79eb016eeb85a193aefe18fd743d6e082a16f906b66dce19b36905cd0e78",
-                    "mixHash" : "0x0431e16e8e71ac1ac9a9cd80e86dd6a885bdbfd0f679085f011d28f81f8a8cf7",
-                    "nonce" : "0x03ec1b6fd8589f68",
+                    "hash" : "0x2f296fd816f4b109c0fad1131ef416f659b7b449c01bb3b0456c0d85e8d5e81f",
+                    "mixHash" : "0x103b9979881a141eeb727214c6b32cf891214f7f14c4117105a020303fcbb986",
+                    "nonce" : "0x1b2a133f9cdcc892",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x6579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcd",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0xb34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a00431e16e8e71ac1ac9a9cd80e86dd6a885bdbfd0f679085f011d28f81f8a8cf78803ec1b6fd8589f68f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a0103b9979881a141eeb727214c6b32cf891214f7f14c4117105a020303fcbb986881b2a133f9cdcc892f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x901b79eb016eeb85a193aefe18fd743d6e082a16f906b66dce19b36905cd0e78",
+        "lastblockhash" : "0x2f296fd816f4b109c0fad1131ef416f659b7b449c01bb3b0456c0d85e8d5e81f",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g1v0.json
index 7a73a41bf..a7bdd1775 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d1g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g1v0Filler.json",
+            "sourceHash" : "e7189705d59feb90f4000d952c71bae2a54b0bb5f3dc12ab4d3a7f5f4158c382"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xfd0a",
+                    "hash" : "0x1e1d4cf0994ce034f6cc59924a3cd171c2c28b6cb8315bb8aded6e39c67254a5",
+                    "mixHash" : "0x840b3f44671c18785212353e888669d63fe46f8c5495bae850c02c14d84286eb",
+                    "nonce" : "0x2fa176b4f9f3cea9",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xe1f20f5f5099b2ad06e03c9619c575c7db2fefeb4d80f0cb103224f59c65a3e0",
+                    "stateRoot" : "0x091ede07f617c91f5c64f68c15b467e91c9475707e8e63d8d1dc7b7602a9143b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x25c728d3b4f4ee71f6b2c158441bc05ad06d023a5141613ea33e15f272a04e7a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0091ede07f617c91f5c64f68c15b467e91c9475707e8e63d8d1dc7b7602a9143ba025c728d3b4f4ee71f6b2c158441bc05ad06d023a5141613ea33e15f272a04e7aa0e1f20f5f5099b2ad06e03c9619c575c7db2fefeb4d80f0cb103224f59c65a3e0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fd0a8203e880a0840b3f44671c18785212353e888669d63fe46f8c5495bae850c02c14d84286eb882fa176b4f9f3cea9f90104f90101800183015f9094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca02d9f347821f0414bbb2a52fb8889731584fc69ece5bc20b0cd284b784c1746d5a00d3d15177ec1deaf5c7bb6968a43f180fd4e3faf6774f990d0a7fdecc81c433ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d9f347821f0414bbb2a52fb8889731584fc69ece5bc20b0cd284b784c1746d5",
+                        "s" : "0x0d3d15177ec1deaf5c7bb6968a43f180fd4e3faf6774f990d0a7fdecc81c433a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1e1d4cf0994ce034f6cc59924a3cd171c2c28b6cb8315bb8aded6e39c67254a5",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cfd0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f02f6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d1g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g1v0Filler.json",
+            "sourceHash" : "e7189705d59feb90f4000d952c71bae2a54b0bb5f3dc12ab4d3a7f5f4158c382"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca0a",
+                    "hash" : "0x21576b0837c4bedde7c073aad39546affb9203ceacc527e3c7ad72247b4d5ef1",
+                    "mixHash" : "0x782bae980e2dccff3718514581c29ad55bf9e24fcdea0bc7457d3a8242f7c847",
+                    "nonce" : "0x9b391e365337ae16",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x6579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcd",
+                    "stateRoot" : "0x0dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x25c728d3b4f4ee71f6b2c158441bc05ad06d023a5141613ea33e15f272a04e7a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a025c728d3b4f4ee71f6b2c158441bc05ad06d023a5141613ea33e15f272a04e7aa06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a0782bae980e2dccff3718514581c29ad55bf9e24fcdea0bc7457d3a8242f7c847889b391e365337ae16f90104f90101800183015f9094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca02d9f347821f0414bbb2a52fb8889731584fc69ece5bc20b0cd284b784c1746d5a00d3d15177ec1deaf5c7bb6968a43f180fd4e3faf6774f990d0a7fdecc81c433ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d9f347821f0414bbb2a52fb8889731584fc69ece5bc20b0cd284b784c1746d5",
+                        "s" : "0x0d3d15177ec1deaf5c7bb6968a43f180fd4e3faf6774f990d0a7fdecc81c433a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x21576b0837c4bedde7c073aad39546affb9203ceacc527e3c7ad72247b4d5ef1",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f35f6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d1g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g1v0Filler.json",
+            "sourceHash" : "e7189705d59feb90f4000d952c71bae2a54b0bb5f3dc12ab4d3a7f5f4158c382"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca0a",
+                    "hash" : "0xd7c97ff2f8c062983ebcad3bf90f35a3ef72ec688c3bc8767f3ca30e4039e289",
+                    "mixHash" : "0xaca5ffdcb7600a9d70f30237b45a1a7885269e4d361ab7556ae7a6fa00b13932",
+                    "nonce" : "0xb2ab5f3f284b5084",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x6579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcd",
+                    "stateRoot" : "0x0dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x25c728d3b4f4ee71f6b2c158441bc05ad06d023a5141613ea33e15f272a04e7a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a025c728d3b4f4ee71f6b2c158441bc05ad06d023a5141613ea33e15f272a04e7aa06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a0aca5ffdcb7600a9d70f30237b45a1a7885269e4d361ab7556ae7a6fa00b1393288b2ab5f3f284b5084f90104f90101800183015f9094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca02d9f347821f0414bbb2a52fb8889731584fc69ece5bc20b0cd284b784c1746d5a00d3d15177ec1deaf5c7bb6968a43f180fd4e3faf6774f990d0a7fdecc81c433ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d9f347821f0414bbb2a52fb8889731584fc69ece5bc20b0cd284b784c1746d5",
+                        "s" : "0x0d3d15177ec1deaf5c7bb6968a43f180fd4e3faf6774f990d0a7fdecc81c433a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd7c97ff2f8c062983ebcad3bf90f35a3ef72ec688c3bc8767f3ca30e4039e289",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f35f6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g2v0.json
index 7a73a41bf..24381d6cc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d1g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g2v0Filler.json",
+            "sourceHash" : "2c366dc7c3d119b2384998b9a733c83691d98925b0abf1de6646dfc6583ebba1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xfd0a",
+                    "hash" : "0xc33874dff1eeb7af012778580b03d3a99a6022d3a051ea679e21e1e35377ff8a",
+                    "mixHash" : "0x0f50aeba9df838cb8154f0e2d45edfb2aca883a6075c69f337a15003ff26fee4",
+                    "nonce" : "0x771531fcd6ad6ddb",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xe1f20f5f5099b2ad06e03c9619c575c7db2fefeb4d80f0cb103224f59c65a3e0",
+                    "stateRoot" : "0x091ede07f617c91f5c64f68c15b467e91c9475707e8e63d8d1dc7b7602a9143b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa088632d47c29811dbeb7b91976002e490244fee6cc5eed77901362c312278a1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0091ede07f617c91f5c64f68c15b467e91c9475707e8e63d8d1dc7b7602a9143ba0a088632d47c29811dbeb7b91976002e490244fee6cc5eed77901362c312278a1a0e1f20f5f5099b2ad06e03c9619c575c7db2fefeb4d80f0cb103224f59c65a3e0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fd0a8203e880a00f50aeba9df838cb8154f0e2d45edfb2aca883a6075c69f337a15003ff26fee488771531fcd6ad6ddbf90104f9010180018301adb094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca0619d0f3273b3a01af646904a8d8971532fd6afe47251843ce1bae6103b31a0bfa006d4749e4b1af4ed883ccc24dfb8027b4bc6a6cd592ca09787d3a718cdc4d0c9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x619d0f3273b3a01af646904a8d8971532fd6afe47251843ce1bae6103b31a0bf",
+                        "s" : "0x06d4749e4b1af4ed883ccc24dfb8027b4bc6a6cd592ca09787d3a718cdc4d0c9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc33874dff1eeb7af012778580b03d3a99a6022d3a051ea679e21e1e35377ff8a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cfd0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f02f6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d1g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g2v0Filler.json",
+            "sourceHash" : "2c366dc7c3d119b2384998b9a733c83691d98925b0abf1de6646dfc6583ebba1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca0a",
+                    "hash" : "0x22f574ce7ea5104497a624220ceaafbdd4dceee7212c23de74a783ffaf995630",
+                    "mixHash" : "0xe110ea3acbdb79719da2d16ed70ced51ca832deeff4d12ca63cfe843ac990e7f",
+                    "nonce" : "0x46bf9beca33c6118",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x6579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcd",
+                    "stateRoot" : "0x0dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa088632d47c29811dbeb7b91976002e490244fee6cc5eed77901362c312278a1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a0a088632d47c29811dbeb7b91976002e490244fee6cc5eed77901362c312278a1a06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a0e110ea3acbdb79719da2d16ed70ced51ca832deeff4d12ca63cfe843ac990e7f8846bf9beca33c6118f90104f9010180018301adb094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca0619d0f3273b3a01af646904a8d8971532fd6afe47251843ce1bae6103b31a0bfa006d4749e4b1af4ed883ccc24dfb8027b4bc6a6cd592ca09787d3a718cdc4d0c9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x619d0f3273b3a01af646904a8d8971532fd6afe47251843ce1bae6103b31a0bf",
+                        "s" : "0x06d4749e4b1af4ed883ccc24dfb8027b4bc6a6cd592ca09787d3a718cdc4d0c9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x22f574ce7ea5104497a624220ceaafbdd4dceee7212c23de74a783ffaf995630",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f35f6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d1g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g2v0Filler.json",
+            "sourceHash" : "2c366dc7c3d119b2384998b9a733c83691d98925b0abf1de6646dfc6583ebba1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca0a",
+                    "hash" : "0x11d9905a7d2af0f1d8510ff8616df84e89058cc518adbeb929933d720d8b8e55",
+                    "mixHash" : "0x74c996e284200129a494f9e4c092d9dcc7c7e1f6abb15cc325241a507aecb521",
+                    "nonce" : "0xf29321ce5f2e6f1d",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x6579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcd",
+                    "stateRoot" : "0x0dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa088632d47c29811dbeb7b91976002e490244fee6cc5eed77901362c312278a1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a0a088632d47c29811dbeb7b91976002e490244fee6cc5eed77901362c312278a1a06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a074c996e284200129a494f9e4c092d9dcc7c7e1f6abb15cc325241a507aecb52188f29321ce5f2e6f1df90104f9010180018301adb094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca0619d0f3273b3a01af646904a8d8971532fd6afe47251843ce1bae6103b31a0bfa006d4749e4b1af4ed883ccc24dfb8027b4bc6a6cd592ca09787d3a718cdc4d0c9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x619d0f3273b3a01af646904a8d8971532fd6afe47251843ce1bae6103b31a0bf",
+                        "s" : "0x06d4749e4b1af4ed883ccc24dfb8027b4bc6a6cd592ca09787d3a718cdc4d0c9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x11d9905a7d2af0f1d8510ff8616df84e89058cc518adbeb929933d720d8b8e55",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f35f6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g3v0.json
index 7a73a41bf..5b1e8d74e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d1g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g3v0Filler.json",
+            "sourceHash" : "dfe31388a0debb42d177dedcbf5976f714eda217f4d4144ebf7b08d268f1f63d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xfd0a",
+                    "hash" : "0x964d531b09b1ad4dd2cc2ed107a6907522d5e6a131c8c27e8d2e79d9bd34b697",
+                    "mixHash" : "0xdc646e7d57a792febc70e060234f0b7f41cf659873c3acd0f0fffb5bc00b09ac",
+                    "nonce" : "0xc524de9cb0a8efe8",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xe1f20f5f5099b2ad06e03c9619c575c7db2fefeb4d80f0cb103224f59c65a3e0",
+                    "stateRoot" : "0x091ede07f617c91f5c64f68c15b467e91c9475707e8e63d8d1dc7b7602a9143b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf77d6883277a28a027eb98194942899ad9536b579dc2388863b49559de23122d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0091ede07f617c91f5c64f68c15b467e91c9475707e8e63d8d1dc7b7602a9143ba0f77d6883277a28a027eb98194942899ad9536b579dc2388863b49559de23122da0e1f20f5f5099b2ad06e03c9619c575c7db2fefeb4d80f0cb103224f59c65a3e0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fd0a8203e880a0dc646e7d57a792febc70e060234f0b7f41cf659873c3acd0f0fffb5bc00b09ac88c524de9cb0a8efe8f90104f90101800183030d4094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba058242ad5d9a2baebb942199e3447250a8661261de23a047eed4d1feae4eeef84a025995560c7ed24e341a3597626948a2c57788954b38b0f382be4916268a51053c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58242ad5d9a2baebb942199e3447250a8661261de23a047eed4d1feae4eeef84",
+                        "s" : "0x25995560c7ed24e341a3597626948a2c57788954b38b0f382be4916268a51053",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x964d531b09b1ad4dd2cc2ed107a6907522d5e6a131c8c27e8d2e79d9bd34b697",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cfd0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f02f6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d1g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g3v0Filler.json",
+            "sourceHash" : "dfe31388a0debb42d177dedcbf5976f714eda217f4d4144ebf7b08d268f1f63d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca0a",
+                    "hash" : "0x25a2c03ae3fd7e4c803252139d89a9b6fe48b1bccf28c5b7045ae0f95bb87df2",
+                    "mixHash" : "0xf234afd6b792c4536ffe7141d76199ba9e3fd52f9f5731a9dbd0f09092616a64",
+                    "nonce" : "0x32ff64f6aef82ede",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x6579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcd",
+                    "stateRoot" : "0x0dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf77d6883277a28a027eb98194942899ad9536b579dc2388863b49559de23122d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a0f77d6883277a28a027eb98194942899ad9536b579dc2388863b49559de23122da06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a0f234afd6b792c4536ffe7141d76199ba9e3fd52f9f5731a9dbd0f09092616a648832ff64f6aef82edef90104f90101800183030d4094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba058242ad5d9a2baebb942199e3447250a8661261de23a047eed4d1feae4eeef84a025995560c7ed24e341a3597626948a2c57788954b38b0f382be4916268a51053c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58242ad5d9a2baebb942199e3447250a8661261de23a047eed4d1feae4eeef84",
+                        "s" : "0x25995560c7ed24e341a3597626948a2c57788954b38b0f382be4916268a51053",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x25a2c03ae3fd7e4c803252139d89a9b6fe48b1bccf28c5b7045ae0f95bb87df2",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f35f6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d1g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g3v0Filler.json",
+            "sourceHash" : "dfe31388a0debb42d177dedcbf5976f714eda217f4d4144ebf7b08d268f1f63d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca0a",
+                    "hash" : "0x8da9bb614045324a45bdc82c5aab91c3bbe29f27f74e0f9de7d3c60cdf7a8999",
+                    "mixHash" : "0x7ed8723c62a2de6fef32d393cccd59ae77c8b124671fb6a59e2d9aaa7b96fead",
+                    "nonce" : "0x44548ceeaa78bfc3",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x6579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcd",
+                    "stateRoot" : "0x0dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf77d6883277a28a027eb98194942899ad9536b579dc2388863b49559de23122d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a0f77d6883277a28a027eb98194942899ad9536b579dc2388863b49559de23122da06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a07ed8723c62a2de6fef32d393cccd59ae77c8b124671fb6a59e2d9aaa7b96fead8844548ceeaa78bfc3f90104f90101800183030d4094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba058242ad5d9a2baebb942199e3447250a8661261de23a047eed4d1feae4eeef84a025995560c7ed24e341a3597626948a2c57788954b38b0f382be4916268a51053c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58242ad5d9a2baebb942199e3447250a8661261de23a047eed4d1feae4eeef84",
+                        "s" : "0x25995560c7ed24e341a3597626948a2c57788954b38b0f382be4916268a51053",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8da9bb614045324a45bdc82c5aab91c3bbe29f27f74e0f9de7d3c60cdf7a8999",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f35f6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g0v0.json
index fee4ac800..53efe664a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d20g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g0v0Filler.json",
             "sourceHash" : "e1b36d1975c76b775abb95d9f92517dcb6d8724971e47214f92a2d2cdae0d104"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9cf",
-                    "hash" : "0x56e6cd687a8f979455cd718a4db6da152cde69f3856bd08562cf8afdeeafe64c",
-                    "mixHash" : "0x62c46eca96c8bded8658594fcbfd4e14a3243171de2e2eee5cd210e8b93459a4",
-                    "nonce" : "0xf78ada3ad624b2ae",
+                    "hash" : "0x7c0447c35f8139a3722b7d4b6a477339ca7a5bc9ce4a6631508a6794ccecac6f",
+                    "mixHash" : "0xbe54bee85fe02420a2148a96664ee5b766be578da8cd61916e36ab278a41fc63",
+                    "nonce" : "0xe5ebeba166ed80f3",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x5a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x8847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061c5e41a71b2559ddf70fba5a976c96b66e03fcfee8334b422c523463fe9f6daa08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a05a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a062c46eca96c8bded8658594fcbfd4e14a3243171de2e2eee5cd210e8b93459a488f78ada3ad624b2aef8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061c5e41a71b2559ddf70fba5a976c96b66e03fcfee8334b422c523463fe9f6daa08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a05a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0be54bee85fe02420a2148a96664ee5b766be578da8cd61916e36ab278a41fc6388e5ebeba166ed80f3f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56e6cd687a8f979455cd718a4db6da152cde69f3856bd08562cf8afdeeafe64c",
+        "lastblockhash" : "0x7c0447c35f8139a3722b7d4b6a477339ca7a5bc9ce4a6631508a6794ccecac6f",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d20g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g0v0Filler.json",
             "sourceHash" : "e1b36d1975c76b775abb95d9f92517dcb6d8724971e47214f92a2d2cdae0d104"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9cf",
-                    "hash" : "0x10804417ebb9e6e4e7c548130e599db2b711f0bd83bea6e1849aabd601d7ad46",
-                    "mixHash" : "0x8b0873b8c51837fb4abfbe6d8d84386d7c47177588d9627804045095f50599f5",
-                    "nonce" : "0xee8903d39cf85652",
+                    "hash" : "0xd65d97cba0d6633db7bd52d6bc87fb9f16b40835c9ad1ac7945d98ea9fd86515",
+                    "mixHash" : "0xbfb01a71fad7178f20313dd639eaa9dbc2ed8e5030403eea05bd839e0a0041f0",
+                    "nonce" : "0x9c65f1917b5ca50c",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0x8847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a08b0873b8c51837fb4abfbe6d8d84386d7c47177588d9627804045095f50599f588ee8903d39cf85652f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0bfb01a71fad7178f20313dd639eaa9dbc2ed8e5030403eea05bd839e0a0041f0889c65f1917b5ca50cf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x10804417ebb9e6e4e7c548130e599db2b711f0bd83bea6e1849aabd601d7ad46",
+        "lastblockhash" : "0xd65d97cba0d6633db7bd52d6bc87fb9f16b40835c9ad1ac7945d98ea9fd86515",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d20g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g0v0Filler.json",
             "sourceHash" : "e1b36d1975c76b775abb95d9f92517dcb6d8724971e47214f92a2d2cdae0d104"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9cf",
-                    "hash" : "0xfd9f623af3603931013cb9da8eaa69b1e5b3d4154c421bc338588c6a7ca9a87b",
-                    "mixHash" : "0x0860d76ada998efc98ff8de6538f699920b178d9b2ac3384037469e9d704d26d",
-                    "nonce" : "0x12129979c227fc01",
+                    "hash" : "0x900dbf908218e6d0ff41daeb78897eb2b9c6a9f0be16efcf74a19688bde6d8c4",
+                    "mixHash" : "0x558950d405355dc2e37705ab62bd303a4110c4fc54d1a058879e4ff5b783e59e",
+                    "nonce" : "0x4b0f577541a9bcba",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0x8847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a00860d76ada998efc98ff8de6538f699920b178d9b2ac3384037469e9d704d26d8812129979c227fc01f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0558950d405355dc2e37705ab62bd303a4110c4fc54d1a058879e4ff5b783e59e884b0f577541a9bcbaf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd9f623af3603931013cb9da8eaa69b1e5b3d4154c421bc338588c6a7ca9a87b",
+        "lastblockhash" : "0x900dbf908218e6d0ff41daeb78897eb2b9c6a9f0be16efcf74a19688bde6d8c4",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g1v0.json
index 7a73a41bf..a3be536c4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d20g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g1v0Filler.json",
+            "sourceHash" : "7962cc3ff37d46828a161f02e79dc62633a3c245b632e17c8db99e031d997d6c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0xf8cbdb8fb253fe24a7906405eb7fd2283935ca1ce5ae5c20389c80f61936e748",
+                    "mixHash" : "0x76cdec6d9c5f73765ce8cc258562124f7df94dfb76497fdaed41f91cf3787a91",
+                    "nonce" : "0x643d865ed5d9ff8e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8",
+                    "stateRoot" : "0x61c5e41a71b2559ddf70fba5a976c96b66e03fcfee8334b422c523463fe9f6da",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf057e7425aae37d14dd216fda98b441640631b08e91a74fc7e48ae9974398c8c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061c5e41a71b2559ddf70fba5a976c96b66e03fcfee8334b422c523463fe9f6daa0f057e7425aae37d14dd216fda98b441640631b08e91a74fc7e48ae9974398c8ca05a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a076cdec6d9c5f73765ce8cc258562124f7df94dfb76497fdaed41f91cf3787a9188643d865ed5d9ff8ef8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba05cac1506e4ba1cd064ffd78d38c39911d87443c384b38ae2f38a7c0a70a69a1ca05cc8cf128affe11433668711864bb47d98576e4d3799b2d5007ce1f402015851c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5cac1506e4ba1cd064ffd78d38c39911d87443c384b38ae2f38a7c0a70a69a1c",
+                        "s" : "0x5cc8cf128affe11433668711864bb47d98576e4d3799b2d5007ce1f402015851",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf8cbdb8fb253fe24a7906405eb7fd2283935ca1ce5ae5c20389c80f61936e748",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d20g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g1v0Filler.json",
+            "sourceHash" : "7962cc3ff37d46828a161f02e79dc62633a3c245b632e17c8db99e031d997d6c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0xee9628d05a3208058147be87d7f441188615a2e0f467bd28be9fbbe40aacbaf8",
+                    "mixHash" : "0x732b82de34a06242631d3326b11fb7b59eeb7b053ab81cde6a12d595e3cb6c4a",
+                    "nonce" : "0x67467d5054b8293f",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf057e7425aae37d14dd216fda98b441640631b08e91a74fc7e48ae9974398c8c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a0f057e7425aae37d14dd216fda98b441640631b08e91a74fc7e48ae9974398c8ca01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0732b82de34a06242631d3326b11fb7b59eeb7b053ab81cde6a12d595e3cb6c4a8867467d5054b8293ff8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba05cac1506e4ba1cd064ffd78d38c39911d87443c384b38ae2f38a7c0a70a69a1ca05cc8cf128affe11433668711864bb47d98576e4d3799b2d5007ce1f402015851c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5cac1506e4ba1cd064ffd78d38c39911d87443c384b38ae2f38a7c0a70a69a1c",
+                        "s" : "0x5cc8cf128affe11433668711864bb47d98576e4d3799b2d5007ce1f402015851",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xee9628d05a3208058147be87d7f441188615a2e0f467bd28be9fbbe40aacbaf8",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d20g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g1v0Filler.json",
+            "sourceHash" : "7962cc3ff37d46828a161f02e79dc62633a3c245b632e17c8db99e031d997d6c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0xeaf131038c335e311f303a00d3304f9f4e39717c7b294e2aea05beed6723b3a7",
+                    "mixHash" : "0xda147cc04df6982527705a68bf9a6e7975fb8a8f1ba8dc93453319ad600a52dd",
+                    "nonce" : "0x78b7d3c4c68d7fbf",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf057e7425aae37d14dd216fda98b441640631b08e91a74fc7e48ae9974398c8c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a0f057e7425aae37d14dd216fda98b441640631b08e91a74fc7e48ae9974398c8ca01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0da147cc04df6982527705a68bf9a6e7975fb8a8f1ba8dc93453319ad600a52dd8878b7d3c4c68d7fbff8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba05cac1506e4ba1cd064ffd78d38c39911d87443c384b38ae2f38a7c0a70a69a1ca05cc8cf128affe11433668711864bb47d98576e4d3799b2d5007ce1f402015851c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5cac1506e4ba1cd064ffd78d38c39911d87443c384b38ae2f38a7c0a70a69a1c",
+                        "s" : "0x5cc8cf128affe11433668711864bb47d98576e4d3799b2d5007ce1f402015851",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xeaf131038c335e311f303a00d3304f9f4e39717c7b294e2aea05beed6723b3a7",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g2v0.json
index 7a73a41bf..a393b340e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d20g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g2v0Filler.json",
+            "sourceHash" : "149d986dd4b62ae69fd53a501367183fd73318e3a2c573f5770d665f80c8a88f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0x80d3d1ee3b7c37ba8883f61a768eff8cec0adc44f7b080337a039144c95f3781",
+                    "mixHash" : "0x095712393cb8220c3c52300dc3c9cf09b45d6294c5db795b86dcb2c715dc2131",
+                    "nonce" : "0x1a7d66aba85c4fac",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8",
+                    "stateRoot" : "0x61c5e41a71b2559ddf70fba5a976c96b66e03fcfee8334b422c523463fe9f6da",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x25f79b157042e63b12fecfb8fac3f0118f2b03f71d097c37dca9551253293904",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061c5e41a71b2559ddf70fba5a976c96b66e03fcfee8334b422c523463fe9f6daa025f79b157042e63b12fecfb8fac3f0118f2b03f71d097c37dca9551253293904a05a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0095712393cb8220c3c52300dc3c9cf09b45d6294c5db795b86dcb2c715dc2131881a7d66aba85c4facf8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba05e83d54f4e4c21e528bb30d242fe7eb5db5980f71cfb28c51c6ea86214040582a052dcb150da6c008fb81f1f9c3cc1718549ac847687ebef344451c7c33376d835c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e83d54f4e4c21e528bb30d242fe7eb5db5980f71cfb28c51c6ea86214040582",
+                        "s" : "0x52dcb150da6c008fb81f1f9c3cc1718549ac847687ebef344451c7c33376d835",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x80d3d1ee3b7c37ba8883f61a768eff8cec0adc44f7b080337a039144c95f3781",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d20g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g2v0Filler.json",
+            "sourceHash" : "149d986dd4b62ae69fd53a501367183fd73318e3a2c573f5770d665f80c8a88f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0xb64e7df6ddb5832a4e185a0fe36289c795d57e24e54b2265d4e220a1b5d001ee",
+                    "mixHash" : "0x5a46273831fde8844b62f1c953febd71e21f881451851c6d439d657e1eb362ff",
+                    "nonce" : "0x2bee81b55fae3946",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x25f79b157042e63b12fecfb8fac3f0118f2b03f71d097c37dca9551253293904",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a025f79b157042e63b12fecfb8fac3f0118f2b03f71d097c37dca9551253293904a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a05a46273831fde8844b62f1c953febd71e21f881451851c6d439d657e1eb362ff882bee81b55fae3946f8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba05e83d54f4e4c21e528bb30d242fe7eb5db5980f71cfb28c51c6ea86214040582a052dcb150da6c008fb81f1f9c3cc1718549ac847687ebef344451c7c33376d835c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e83d54f4e4c21e528bb30d242fe7eb5db5980f71cfb28c51c6ea86214040582",
+                        "s" : "0x52dcb150da6c008fb81f1f9c3cc1718549ac847687ebef344451c7c33376d835",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb64e7df6ddb5832a4e185a0fe36289c795d57e24e54b2265d4e220a1b5d001ee",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d20g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g2v0Filler.json",
+            "sourceHash" : "149d986dd4b62ae69fd53a501367183fd73318e3a2c573f5770d665f80c8a88f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0xc36bcfc3905ebba9c33fad6e4ae064ee8da6a25f679d38ce9ea4133e2c5b6bcd",
+                    "mixHash" : "0xd6630330d6c651cee3733eb4a17df69601e454c7174f347c504e72687abf2d49",
+                    "nonce" : "0xb9c12833ecedaa91",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x25f79b157042e63b12fecfb8fac3f0118f2b03f71d097c37dca9551253293904",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a025f79b157042e63b12fecfb8fac3f0118f2b03f71d097c37dca9551253293904a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0d6630330d6c651cee3733eb4a17df69601e454c7174f347c504e72687abf2d4988b9c12833ecedaa91f8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba05e83d54f4e4c21e528bb30d242fe7eb5db5980f71cfb28c51c6ea86214040582a052dcb150da6c008fb81f1f9c3cc1718549ac847687ebef344451c7c33376d835c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e83d54f4e4c21e528bb30d242fe7eb5db5980f71cfb28c51c6ea86214040582",
+                        "s" : "0x52dcb150da6c008fb81f1f9c3cc1718549ac847687ebef344451c7c33376d835",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc36bcfc3905ebba9c33fad6e4ae064ee8da6a25f679d38ce9ea4133e2c5b6bcd",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g3v0.json
index 7a73a41bf..d7573f8d0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d20g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g3v0Filler.json",
+            "sourceHash" : "d97831b41b322bcc4421486187e01e3dcd1bd821eeb64665c326c4a79b6aba8c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0x4d7d4ec44bf5c0d42b8d2b8bb9288df87ed3739651705616f71071c3f857030a",
+                    "mixHash" : "0xa60559e45829a333fa247a3b26a840d421c52019a33c7e74f58ad54c2db219ae",
+                    "nonce" : "0xde7e73e3a7edf3b4",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8",
+                    "stateRoot" : "0x61c5e41a71b2559ddf70fba5a976c96b66e03fcfee8334b422c523463fe9f6da",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9983f9ad4ce2aa7db3c51f1db968ff067c8ba243beead53ee5fc94a750a6d7f5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061c5e41a71b2559ddf70fba5a976c96b66e03fcfee8334b422c523463fe9f6daa09983f9ad4ce2aa7db3c51f1db968ff067c8ba243beead53ee5fc94a750a6d7f5a05a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0a60559e45829a333fa247a3b26a840d421c52019a33c7e74f58ad54c2db219ae88de7e73e3a7edf3b4f8c4f8c2800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ca0d13da92268b8446227aa6190806114df4066a46482279046009545de258b0a639f9eb75b51dbf3ded5d8ffb30a4d44235ac3f10e4a41cd9e524ea83d24180b81c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd13da92268b8446227aa6190806114df4066a46482279046009545de258b0a63",
+                        "s" : "0x9eb75b51dbf3ded5d8ffb30a4d44235ac3f10e4a41cd9e524ea83d24180b81",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4d7d4ec44bf5c0d42b8d2b8bb9288df87ed3739651705616f71071c3f857030a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d20g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g3v0Filler.json",
+            "sourceHash" : "d97831b41b322bcc4421486187e01e3dcd1bd821eeb64665c326c4a79b6aba8c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0x427875963c4f3dac913dafe3a52905dd925beede4d7cefe9c97afe6bb24abc12",
+                    "mixHash" : "0x9a46da93c417a640ba12cf429c2e72b32fdcce401c73eecce84c4ccc6d5640a2",
+                    "nonce" : "0xd462a168546e6df4",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9983f9ad4ce2aa7db3c51f1db968ff067c8ba243beead53ee5fc94a750a6d7f5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a09983f9ad4ce2aa7db3c51f1db968ff067c8ba243beead53ee5fc94a750a6d7f5a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a09a46da93c417a640ba12cf429c2e72b32fdcce401c73eecce84c4ccc6d5640a288d462a168546e6df4f8c4f8c2800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ca0d13da92268b8446227aa6190806114df4066a46482279046009545de258b0a639f9eb75b51dbf3ded5d8ffb30a4d44235ac3f10e4a41cd9e524ea83d24180b81c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd13da92268b8446227aa6190806114df4066a46482279046009545de258b0a63",
+                        "s" : "0x9eb75b51dbf3ded5d8ffb30a4d44235ac3f10e4a41cd9e524ea83d24180b81",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x427875963c4f3dac913dafe3a52905dd925beede4d7cefe9c97afe6bb24abc12",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d20g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g3v0Filler.json",
+            "sourceHash" : "d97831b41b322bcc4421486187e01e3dcd1bd821eeb64665c326c4a79b6aba8c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0x17da31408af41df8474c84ad8992e5f45db7bb7f3263cf1b0966db338caf3455",
+                    "mixHash" : "0x5a02e2b76d6cd2b2d3a3a67146e0a15eefd944370052828138a4beb983330199",
+                    "nonce" : "0x377ae6921e503456",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9983f9ad4ce2aa7db3c51f1db968ff067c8ba243beead53ee5fc94a750a6d7f5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a09983f9ad4ce2aa7db3c51f1db968ff067c8ba243beead53ee5fc94a750a6d7f5a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a05a02e2b76d6cd2b2d3a3a67146e0a15eefd944370052828138a4beb98333019988377ae6921e503456f8c4f8c2800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ca0d13da92268b8446227aa6190806114df4066a46482279046009545de258b0a639f9eb75b51dbf3ded5d8ffb30a4d44235ac3f10e4a41cd9e524ea83d24180b81c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd13da92268b8446227aa6190806114df4066a46482279046009545de258b0a63",
+                        "s" : "0x9eb75b51dbf3ded5d8ffb30a4d44235ac3f10e4a41cd9e524ea83d24180b81",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x17da31408af41df8474c84ad8992e5f45db7bb7f3263cf1b0966db338caf3455",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g0v0.json
index 74cacca82..c7648f5e1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d21g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g0v0Filler.json",
             "sourceHash" : "9c0a101ddb6948189cd3aba624acdd75319be68963d3c2300450b4d3df7e7e0d"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba15",
-                    "hash" : "0xb17baba00893ab392a5b5d589e6324f783960b895fa84152b62209f33e149c8e",
-                    "mixHash" : "0xdf465d0e107a191cc544736256e517fb1e945166c673ebaca4aae239fd7ba2e3",
-                    "nonce" : "0x2829442893d0338f",
+                    "hash" : "0xd55d2cc8b9da111f63a1df3b2960e58fa1db1b23533d5fc15edc7aed05be31b5",
+                    "mixHash" : "0x4bdb8cf5829254194b09f58af87e4930eeed90cae69afc147e7ec478994ae5a5",
+                    "nonce" : "0x18d65619bda1ed03",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xc9ecfab25aa38fb7f789a2e8cb97012a43380ff726c4ffaab5ac75a20939dbd8",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x5582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d42491aa1fae0adaea81f1025da23761114c9839d73e64169ae595cee2c58b41a05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a0c9ecfab25aa38fb7f789a2e8cb97012a43380ff726c4ffaab5ac75a20939dbd8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba158203e880a0df465d0e107a191cc544736256e517fb1e945166c673ebaca4aae239fd7ba2e3882829442893d0338ff8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d42491aa1fae0adaea81f1025da23761114c9839d73e64169ae595cee2c58b41a05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a0c9ecfab25aa38fb7f789a2e8cb97012a43380ff726c4ffaab5ac75a20939dbd8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba158203e880a04bdb8cf5829254194b09f58af87e4930eeed90cae69afc147e7ec478994ae5a58818d65619bda1ed03f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb17baba00893ab392a5b5d589e6324f783960b895fa84152b62209f33e149c8e",
+        "lastblockhash" : "0xd55d2cc8b9da111f63a1df3b2960e58fa1db1b23533d5fc15edc7aed05be31b5",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d21g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g0v0Filler.json",
             "sourceHash" : "9c0a101ddb6948189cd3aba624acdd75319be68963d3c2300450b4d3df7e7e0d"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba13",
-                    "hash" : "0xba566cb46d854db9e4b7cbbdc2b162cd5758cff583e0fdfea5144f1acdd0d83d",
-                    "mixHash" : "0x7a2aca1f11d75152d738a17fa05084e28a502128fc1e12c79b81111a6cdb0ddf",
-                    "nonce" : "0xc07ffcd5874fc745",
+                    "hash" : "0x14d0a8ff1a64ce10021436ca28bd40dc3683b64a072be3d629e1f296776f53bd",
+                    "mixHash" : "0xa285e75aeb04cf87059269add019a5f4c1c692178bbccf2401e91633679cabb6",
+                    "nonce" : "0x585f82e4972f67bd",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0x5582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a07a2aca1f11d75152d738a17fa05084e28a502128fc1e12c79b81111a6cdb0ddf88c07ffcd5874fc745f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a0a285e75aeb04cf87059269add019a5f4c1c692178bbccf2401e91633679cabb688585f82e4972f67bdf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xba566cb46d854db9e4b7cbbdc2b162cd5758cff583e0fdfea5144f1acdd0d83d",
+        "lastblockhash" : "0x14d0a8ff1a64ce10021436ca28bd40dc3683b64a072be3d629e1f296776f53bd",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d21g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g0v0Filler.json",
             "sourceHash" : "9c0a101ddb6948189cd3aba624acdd75319be68963d3c2300450b4d3df7e7e0d"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba13",
-                    "hash" : "0x081c1dd169ef1f37450f8eda53286926cb97713feb77f55e3b8ec6c29db32860",
-                    "mixHash" : "0x2d78984de9a1d64bc59e556198dfa9e1d1706e4f7f5ac3edabc68f5b8e630fd0",
-                    "nonce" : "0x9228835033e5c030",
+                    "hash" : "0x0ec47f8c9ac04dbf04e1d1dddeebce8d36677eda4b7fc8c8c2f526727da7bc3c",
+                    "mixHash" : "0x869238a02e7a638e6016074c7e3a8238e2d11ad1c47785a2d9ce6cc572457750",
+                    "nonce" : "0xd7f4e2bddc1bba1b",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0x5582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a02d78984de9a1d64bc59e556198dfa9e1d1706e4f7f5ac3edabc68f5b8e630fd0889228835033e5c030f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a0869238a02e7a638e6016074c7e3a8238e2d11ad1c47785a2d9ce6cc57245775088d7f4e2bddc1bba1bf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x081c1dd169ef1f37450f8eda53286926cb97713feb77f55e3b8ec6c29db32860",
+        "lastblockhash" : "0x0ec47f8c9ac04dbf04e1d1dddeebce8d36677eda4b7fc8c8c2f526727da7bc3c",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g1v0.json
index 7a73a41bf..952c4bcc9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d21g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g1v0Filler.json",
+            "sourceHash" : "e24d8440612612514d97847a35b2d0f34106c0ba55ce5dcad36ad82bd8d4b9bf"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba15",
+                    "hash" : "0x249f7340f6a3b9c72cc2ae570ae9b00b6166438e2665c93dc2a92dc0b8021a45",
+                    "mixHash" : "0x5dbde6c9b47f55c58c6f87bff81dfbf3f2acfadb79e75ff350f8b3efebd7ac86",
+                    "nonce" : "0x392606348c5adca4",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc9ecfab25aa38fb7f789a2e8cb97012a43380ff726c4ffaab5ac75a20939dbd8",
+                    "stateRoot" : "0xd42491aa1fae0adaea81f1025da23761114c9839d73e64169ae595cee2c58b41",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4f4fc5734d9cf02ed474adf8eac593a229aa803b141869ac4d24684fb1f257e9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d42491aa1fae0adaea81f1025da23761114c9839d73e64169ae595cee2c58b41a04f4fc5734d9cf02ed474adf8eac593a229aa803b141869ac4d24684fb1f257e9a0c9ecfab25aa38fb7f789a2e8cb97012a43380ff726c4ffaab5ac75a20939dbd8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba158203e880a05dbde6c9b47f55c58c6f87bff81dfbf3f2acfadb79e75ff350f8b3efebd7ac8688392606348c5adca4f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba06a3dd2daa2555c18d46439e46b80e7de16023a83cea34fcbbafced31277d2708a022c1a10a3cb71be289bd47beedea7fa27408a07a2479d6c6dffd92e52c52c506c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a3dd2daa2555c18d46439e46b80e7de16023a83cea34fcbbafced31277d2708",
+                        "s" : "0x22c1a10a3cb71be289bd47beedea7fa27408a07a2479d6c6dffd92e52c52c506",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x249f7340f6a3b9c72cc2ae570ae9b00b6166438e2665c93dc2a92dc0b8021a45",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cba15",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45eb",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d21g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g1v0Filler.json",
+            "sourceHash" : "e24d8440612612514d97847a35b2d0f34106c0ba55ce5dcad36ad82bd8d4b9bf"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0xcdcd350afce7bc07566326f0575bfce2ceb5762e33a8096f3913197b3e2e5cb0",
+                    "mixHash" : "0x3bb9d25a97b67d6a31543e95558662c6dcf9b38c08c47789779a25b57565c1da",
+                    "nonce" : "0x8adcc8045f9c5cf2",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4f4fc5734d9cf02ed474adf8eac593a229aa803b141869ac4d24684fb1f257e9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a04f4fc5734d9cf02ed474adf8eac593a229aa803b141869ac4d24684fb1f257e9a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a03bb9d25a97b67d6a31543e95558662c6dcf9b38c08c47789779a25b57565c1da888adcc8045f9c5cf2f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba06a3dd2daa2555c18d46439e46b80e7de16023a83cea34fcbbafced31277d2708a022c1a10a3cb71be289bd47beedea7fa27408a07a2479d6c6dffd92e52c52c506c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a3dd2daa2555c18d46439e46b80e7de16023a83cea34fcbbafced31277d2708",
+                        "s" : "0x22c1a10a3cb71be289bd47beedea7fa27408a07a2479d6c6dffd92e52c52c506",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcdcd350afce7bc07566326f0575bfce2ceb5762e33a8096f3913197b3e2e5cb0",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d21g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g1v0Filler.json",
+            "sourceHash" : "e24d8440612612514d97847a35b2d0f34106c0ba55ce5dcad36ad82bd8d4b9bf"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0xae0178d7f0ae6c400646b57cbf0fd02e7f36a548904d02a3510d9230be918725",
+                    "mixHash" : "0x08a9b54a681671b2ba083304280efc398f07db00894bc42598e54731691f393e",
+                    "nonce" : "0xadf7c1702e155d79",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4f4fc5734d9cf02ed474adf8eac593a229aa803b141869ac4d24684fb1f257e9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a04f4fc5734d9cf02ed474adf8eac593a229aa803b141869ac4d24684fb1f257e9a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a008a9b54a681671b2ba083304280efc398f07db00894bc42598e54731691f393e88adf7c1702e155d79f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba06a3dd2daa2555c18d46439e46b80e7de16023a83cea34fcbbafced31277d2708a022c1a10a3cb71be289bd47beedea7fa27408a07a2479d6c6dffd92e52c52c506c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a3dd2daa2555c18d46439e46b80e7de16023a83cea34fcbbafced31277d2708",
+                        "s" : "0x22c1a10a3cb71be289bd47beedea7fa27408a07a2479d6c6dffd92e52c52c506",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xae0178d7f0ae6c400646b57cbf0fd02e7f36a548904d02a3510d9230be918725",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g2v0.json
index 7a73a41bf..bc97cae3a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d21g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g2v0Filler.json",
+            "sourceHash" : "9ff2951b8ba1d56aa35080ec0eb6803279beb412df57651d2e47d9c8a8aeba19"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba15",
+                    "hash" : "0x703829223cf4e3de9d0b8f27345863b19dfc01e64a4bf27de32a96649a3446b9",
+                    "mixHash" : "0x6f97a3f1cc9022649105a3cd428af580bee256784859f7700def167faf994445",
+                    "nonce" : "0x41f38e2c6f3606ec",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc9ecfab25aa38fb7f789a2e8cb97012a43380ff726c4ffaab5ac75a20939dbd8",
+                    "stateRoot" : "0xd42491aa1fae0adaea81f1025da23761114c9839d73e64169ae595cee2c58b41",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2002d455c70e0ca8404d3b8ead4e8020229957609b55d2a91b9633d986f43a24",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d42491aa1fae0adaea81f1025da23761114c9839d73e64169ae595cee2c58b41a02002d455c70e0ca8404d3b8ead4e8020229957609b55d2a91b9633d986f43a24a0c9ecfab25aa38fb7f789a2e8cb97012a43380ff726c4ffaab5ac75a20939dbd8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba158203e880a06f97a3f1cc9022649105a3cd428af580bee256784859f7700def167faf9944458841f38e2c6f3606ecf8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0c0c626693eac9ff15e3fabae0a2be676dc6af2a57f176ef9dddf27e95e7bab63a05255f422eb9cfbfb5de621d42cf59a868bc2a6b1d4777acd46f202f6656c13fac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0c626693eac9ff15e3fabae0a2be676dc6af2a57f176ef9dddf27e95e7bab63",
+                        "s" : "0x5255f422eb9cfbfb5de621d42cf59a868bc2a6b1d4777acd46f202f6656c13fa",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x703829223cf4e3de9d0b8f27345863b19dfc01e64a4bf27de32a96649a3446b9",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cba15",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45eb",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d21g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g2v0Filler.json",
+            "sourceHash" : "9ff2951b8ba1d56aa35080ec0eb6803279beb412df57651d2e47d9c8a8aeba19"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0x022f440475be5aca1d158b84ec1aea675b48dc07a5d8ef44952a84fb9def81dc",
+                    "mixHash" : "0xb899e7b017ab9b899c17065f407deacff7d0e24371b402ce25efe66650f64b42",
+                    "nonce" : "0x113421b636e4a356",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2002d455c70e0ca8404d3b8ead4e8020229957609b55d2a91b9633d986f43a24",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a02002d455c70e0ca8404d3b8ead4e8020229957609b55d2a91b9633d986f43a24a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a0b899e7b017ab9b899c17065f407deacff7d0e24371b402ce25efe66650f64b4288113421b636e4a356f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0c0c626693eac9ff15e3fabae0a2be676dc6af2a57f176ef9dddf27e95e7bab63a05255f422eb9cfbfb5de621d42cf59a868bc2a6b1d4777acd46f202f6656c13fac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0c626693eac9ff15e3fabae0a2be676dc6af2a57f176ef9dddf27e95e7bab63",
+                        "s" : "0x5255f422eb9cfbfb5de621d42cf59a868bc2a6b1d4777acd46f202f6656c13fa",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x022f440475be5aca1d158b84ec1aea675b48dc07a5d8ef44952a84fb9def81dc",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d21g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g2v0Filler.json",
+            "sourceHash" : "9ff2951b8ba1d56aa35080ec0eb6803279beb412df57651d2e47d9c8a8aeba19"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0x548de0f4a6c0291c9c4aecf5ab40e8a6c1719c8a90a351eaab4aa5f6914308ed",
+                    "mixHash" : "0x0955b8aada23c10201c9788aef11ab49f3753d87c8052918aa6b97dabf35ee6f",
+                    "nonce" : "0xfa9bd00185bf0909",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2002d455c70e0ca8404d3b8ead4e8020229957609b55d2a91b9633d986f43a24",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a02002d455c70e0ca8404d3b8ead4e8020229957609b55d2a91b9633d986f43a24a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a00955b8aada23c10201c9788aef11ab49f3753d87c8052918aa6b97dabf35ee6f88fa9bd00185bf0909f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0c0c626693eac9ff15e3fabae0a2be676dc6af2a57f176ef9dddf27e95e7bab63a05255f422eb9cfbfb5de621d42cf59a868bc2a6b1d4777acd46f202f6656c13fac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0c626693eac9ff15e3fabae0a2be676dc6af2a57f176ef9dddf27e95e7bab63",
+                        "s" : "0x5255f422eb9cfbfb5de621d42cf59a868bc2a6b1d4777acd46f202f6656c13fa",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x548de0f4a6c0291c9c4aecf5ab40e8a6c1719c8a90a351eaab4aa5f6914308ed",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g3v0.json
index 7a73a41bf..3283dd31a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d21g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g3v0Filler.json",
+            "sourceHash" : "6b9e340c1ae03919226f140241bf718ea6a069fd3946fc5758dd7dd9577fe676"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba15",
+                    "hash" : "0xeae453b500a10b9d5a03b14231b4eec7b1e6b37c1d19912b68d3ef6c36229840",
+                    "mixHash" : "0x6a1b4c4209e0f6cf95abe93b0617f16d2dc6f286562d35619ed8656a1099a12f",
+                    "nonce" : "0xaeb0199b15a01e34",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc9ecfab25aa38fb7f789a2e8cb97012a43380ff726c4ffaab5ac75a20939dbd8",
+                    "stateRoot" : "0xd42491aa1fae0adaea81f1025da23761114c9839d73e64169ae595cee2c58b41",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4f64aac0091adb6ef32ea943f9ab5f837a0a59b7bb1614fadd147ce5c621e399",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d42491aa1fae0adaea81f1025da23761114c9839d73e64169ae595cee2c58b41a04f64aac0091adb6ef32ea943f9ab5f837a0a59b7bb1614fadd147ce5c621e399a0c9ecfab25aa38fb7f789a2e8cb97012a43380ff726c4ffaab5ac75a20939dbd8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba158203e880a06a1b4c4209e0f6cf95abe93b0617f16d2dc6f286562d35619ed8656a1099a12f88aeb0199b15a01e34f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ca0c9fb8d6a1b65f58c8ac325ce1118848f270ee811048b4d56878c322134eeff4da03bda0216c3268f482b198cb7e4a4bf48c6f80f9db5f9e9fd781928377907afb8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9fb8d6a1b65f58c8ac325ce1118848f270ee811048b4d56878c322134eeff4d",
+                        "s" : "0x3bda0216c3268f482b198cb7e4a4bf48c6f80f9db5f9e9fd781928377907afb8",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xeae453b500a10b9d5a03b14231b4eec7b1e6b37c1d19912b68d3ef6c36229840",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cba15",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45eb",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d21g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g3v0Filler.json",
+            "sourceHash" : "6b9e340c1ae03919226f140241bf718ea6a069fd3946fc5758dd7dd9577fe676"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0x548d24094300fa4aa51c1744d344ed21672b579c88f5bb676b8b365b52ca6e10",
+                    "mixHash" : "0x6d6eb64d5b1207c4348fc0df97bf3f868eb1bef850f1d5e8ca2f272f5c17eefb",
+                    "nonce" : "0xe46b955d9bd5fcfd",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4f64aac0091adb6ef32ea943f9ab5f837a0a59b7bb1614fadd147ce5c621e399",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a04f64aac0091adb6ef32ea943f9ab5f837a0a59b7bb1614fadd147ce5c621e399a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a06d6eb64d5b1207c4348fc0df97bf3f868eb1bef850f1d5e8ca2f272f5c17eefb88e46b955d9bd5fcfdf8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ca0c9fb8d6a1b65f58c8ac325ce1118848f270ee811048b4d56878c322134eeff4da03bda0216c3268f482b198cb7e4a4bf48c6f80f9db5f9e9fd781928377907afb8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9fb8d6a1b65f58c8ac325ce1118848f270ee811048b4d56878c322134eeff4d",
+                        "s" : "0x3bda0216c3268f482b198cb7e4a4bf48c6f80f9db5f9e9fd781928377907afb8",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x548d24094300fa4aa51c1744d344ed21672b579c88f5bb676b8b365b52ca6e10",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d21g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g3v0Filler.json",
+            "sourceHash" : "6b9e340c1ae03919226f140241bf718ea6a069fd3946fc5758dd7dd9577fe676"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0x41102f38d70fdc1138bc92e01bcd49cb7808455ec0a7f7bbd2decf0f7aae3ee3",
+                    "mixHash" : "0x0078f6be1c0aaa022c34eaae1f4487d8e5a0e95a97609cc20fd8edde7afc2872",
+                    "nonce" : "0x06d1c39514066a4d",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4f64aac0091adb6ef32ea943f9ab5f837a0a59b7bb1614fadd147ce5c621e399",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a04f64aac0091adb6ef32ea943f9ab5f837a0a59b7bb1614fadd147ce5c621e399a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a00078f6be1c0aaa022c34eaae1f4487d8e5a0e95a97609cc20fd8edde7afc28728806d1c39514066a4df8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ca0c9fb8d6a1b65f58c8ac325ce1118848f270ee811048b4d56878c322134eeff4da03bda0216c3268f482b198cb7e4a4bf48c6f80f9db5f9e9fd781928377907afb8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9fb8d6a1b65f58c8ac325ce1118848f270ee811048b4d56878c322134eeff4d",
+                        "s" : "0x3bda0216c3268f482b198cb7e4a4bf48c6f80f9db5f9e9fd781928377907afb8",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x41102f38d70fdc1138bc92e01bcd49cb7808455ec0a7f7bbd2decf0f7aae3ee3",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g0v0.json
index 13007a744..67db42933 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d22g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g0v0Filler.json",
             "sourceHash" : "ef27195244a8297d1c0f85939bdcf48bc972023e107fb330cbaa90be1fd771ef"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d1",
-                    "hash" : "0x60af21f732ea85ce4aefc68508b25a5447b3bd87d1239d8a5da5f7b6a6599888",
-                    "mixHash" : "0xf45f8ea2d70d254eef016ea48a7d70d43586e8bbb5ae5573c71464952099bf1f",
-                    "nonce" : "0xfef7722de64346ca",
+                    "hash" : "0xe90edfd2510b73e93b46b2bde476b2a4bdb08711b5a3fc63df9f192b49047c25",
+                    "mixHash" : "0x4907c8623ba5c38875ae6341916f520f2a9be4813297f6b30e40493d82dd509f",
+                    "nonce" : "0x417747fe3803c641",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x4f105fc1684d90a92745c062f5d127a83e25fff98b0916b705f22fd216070f36",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x27f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdc71928f3fd84b2dbb6e09aad781d1ec294f3f03731c33aa005a0e91944d50fa027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a04f105fc1684d90a92745c062f5d127a83e25fff98b0916b705f22fd216070f36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d18203e880a0f45f8ea2d70d254eef016ea48a7d70d43586e8bbb5ae5573c71464952099bf1f88fef7722de64346caf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdc71928f3fd84b2dbb6e09aad781d1ec294f3f03731c33aa005a0e91944d50fa027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a04f105fc1684d90a92745c062f5d127a83e25fff98b0916b705f22fd216070f36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d18203e880a04907c8623ba5c38875ae6341916f520f2a9be4813297f6b30e40493d82dd509f88417747fe3803c641f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x60af21f732ea85ce4aefc68508b25a5447b3bd87d1239d8a5da5f7b6a6599888",
+        "lastblockhash" : "0xe90edfd2510b73e93b46b2bde476b2a4bdb08711b5a3fc63df9f192b49047c25",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d22g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g0v0Filler.json",
             "sourceHash" : "ef27195244a8297d1c0f85939bdcf48bc972023e107fb330cbaa90be1fd771ef"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9cf",
-                    "hash" : "0xd7c9bd86ecb79eb84a9c98af155b98feb674e745b62cdc2862fabbe8a9be623a",
-                    "mixHash" : "0x9549570cc7267e7d3ccd21cf4bec8ae1f90bd39bc75b1046818e08ed3be9a1c0",
-                    "nonce" : "0x9d94bbc29d6dc63a",
+                    "hash" : "0x28253739070c49a32a9cdf9a2cdb32c72d2558d4c2b32907f974ae90b9e33844",
+                    "mixHash" : "0x879565b73cdc2bcf526e130ebf6ab1d0122413c87ded5a8d3765737ca355678e",
+                    "nonce" : "0x1beec40d2bdef23e",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0x27f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a09549570cc7267e7d3ccd21cf4bec8ae1f90bd39bc75b1046818e08ed3be9a1c0889d94bbc29d6dc63af8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0879565b73cdc2bcf526e130ebf6ab1d0122413c87ded5a8d3765737ca355678e881beec40d2bdef23ef8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7c9bd86ecb79eb84a9c98af155b98feb674e745b62cdc2862fabbe8a9be623a",
+        "lastblockhash" : "0x28253739070c49a32a9cdf9a2cdb32c72d2558d4c2b32907f974ae90b9e33844",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d22g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g0v0Filler.json",
             "sourceHash" : "ef27195244a8297d1c0f85939bdcf48bc972023e107fb330cbaa90be1fd771ef"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9cf",
-                    "hash" : "0x414d13324df54779d885f71f6775e0802ecd5e5dc8aaef74043ed845446f8601",
-                    "mixHash" : "0x026cacae2e6eca306a0b05b04394afbb5d7198b5c69b5ddad5eae05af9f52a66",
-                    "nonce" : "0xff25acff518d7ad6",
+                    "hash" : "0xfe6af095d21c2698c4ea2d3da17288663632ce4c315af62f755b1197fc884eb4",
+                    "mixHash" : "0x73b6afb983beed15a960ef6ea2ba64d903d01cc24b721e5bac69de84bff9c6db",
+                    "nonce" : "0xacbc3225932d8a39",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0x27f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0026cacae2e6eca306a0b05b04394afbb5d7198b5c69b5ddad5eae05af9f52a6688ff25acff518d7ad6f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a073b6afb983beed15a960ef6ea2ba64d903d01cc24b721e5bac69de84bff9c6db88acbc3225932d8a39f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x414d13324df54779d885f71f6775e0802ecd5e5dc8aaef74043ed845446f8601",
+        "lastblockhash" : "0xfe6af095d21c2698c4ea2d3da17288663632ce4c315af62f755b1197fc884eb4",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g1v0.json
index 7a73a41bf..cb6335d3b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d22g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g1v0Filler.json",
+            "sourceHash" : "01f36ea1e88af223b9733d5e78c8a273e987e08bae731d8fc897f5a3d65035da"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d1",
+                    "hash" : "0x72e2aef6e19a897f3cc285b5ccfd74c159fdf95d63d74bf584c5db6a5a9ee9a9",
+                    "mixHash" : "0xa406a0a899126da45543daeae2e752ba3ff866959764b6660690691a912e7fb5",
+                    "nonce" : "0xc0f0db7e508e978c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4f105fc1684d90a92745c062f5d127a83e25fff98b0916b705f22fd216070f36",
+                    "stateRoot" : "0xcdc71928f3fd84b2dbb6e09aad781d1ec294f3f03731c33aa005a0e91944d50f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd1fbfc79f10915cc0b5a96d1d19cf4624a27d46731637bd461175526f5a9eb9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdc71928f3fd84b2dbb6e09aad781d1ec294f3f03731c33aa005a0e91944d50fa0fd1fbfc79f10915cc0b5a96d1d19cf4624a27d46731637bd461175526f5a9eb9a04f105fc1684d90a92745c062f5d127a83e25fff98b0916b705f22fd216070f36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d18203e880a0a406a0a899126da45543daeae2e752ba3ff866959764b6660690691a912e7fb588c0f0db7e508e978cf8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ba0c27a4d6a85d1a1863d875dd7867e1632ea19937961c62a6442a7a4901c829dbfa06399a06eebb5af6a50650436132871b9560f5ac1cac110044701e3e41c84648cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc27a4d6a85d1a1863d875dd7867e1632ea19937961c62a6442a7a4901c829dbf",
+                        "s" : "0x6399a06eebb5af6a50650436132871b9560f5ac1cac110044701e3e41c84648c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x72e2aef6e19a897f3cc285b5ccfd74c159fdf95d63d74bf584c5db6a5a9ee9a9",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d22g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g1v0Filler.json",
+            "sourceHash" : "01f36ea1e88af223b9733d5e78c8a273e987e08bae731d8fc897f5a3d65035da"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0x738ec55e511427b9880f5c83102971915a26ac11675423add01e18be136b79b2",
+                    "mixHash" : "0x442466442fe48f693c96701a1bb28ce998fb28e30a9c7a87530013936c85e7c2",
+                    "nonce" : "0x2a6d66e633dd2461",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd1fbfc79f10915cc0b5a96d1d19cf4624a27d46731637bd461175526f5a9eb9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a0fd1fbfc79f10915cc0b5a96d1d19cf4624a27d46731637bd461175526f5a9eb9a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0442466442fe48f693c96701a1bb28ce998fb28e30a9c7a87530013936c85e7c2882a6d66e633dd2461f8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ba0c27a4d6a85d1a1863d875dd7867e1632ea19937961c62a6442a7a4901c829dbfa06399a06eebb5af6a50650436132871b9560f5ac1cac110044701e3e41c84648cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc27a4d6a85d1a1863d875dd7867e1632ea19937961c62a6442a7a4901c829dbf",
+                        "s" : "0x6399a06eebb5af6a50650436132871b9560f5ac1cac110044701e3e41c84648c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x738ec55e511427b9880f5c83102971915a26ac11675423add01e18be136b79b2",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d22g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g1v0Filler.json",
+            "sourceHash" : "01f36ea1e88af223b9733d5e78c8a273e987e08bae731d8fc897f5a3d65035da"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0x3dd9c84ac17ebc74b93f0486274d747d8dfbacc99d503796a6edbf2d5a6c4551",
+                    "mixHash" : "0xdbaedefbb2cb6ab458c959d5a3749d7b52c6f6c664669e4bbe8cd13f8e29a8cc",
+                    "nonce" : "0x0f459aa36490c4b7",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfd1fbfc79f10915cc0b5a96d1d19cf4624a27d46731637bd461175526f5a9eb9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a0fd1fbfc79f10915cc0b5a96d1d19cf4624a27d46731637bd461175526f5a9eb9a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0dbaedefbb2cb6ab458c959d5a3749d7b52c6f6c664669e4bbe8cd13f8e29a8cc880f459aa36490c4b7f8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ba0c27a4d6a85d1a1863d875dd7867e1632ea19937961c62a6442a7a4901c829dbfa06399a06eebb5af6a50650436132871b9560f5ac1cac110044701e3e41c84648cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc27a4d6a85d1a1863d875dd7867e1632ea19937961c62a6442a7a4901c829dbf",
+                        "s" : "0x6399a06eebb5af6a50650436132871b9560f5ac1cac110044701e3e41c84648c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3dd9c84ac17ebc74b93f0486274d747d8dfbacc99d503796a6edbf2d5a6c4551",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g2v0.json
index 7a73a41bf..5cf15d6b5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d22g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g2v0Filler.json",
+            "sourceHash" : "83e70429d2669d8d37f6cc63f362baaddca8d2e6f3167f9d8ea4457dee19db32"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d1",
+                    "hash" : "0x0d6b69285f35df9c1a5d7f3e9b2a17028727a232477ea717baffc8107ef66382",
+                    "mixHash" : "0x783e733bf6afe766dfe79b0940443dcb8f31fbc8ad6cfbe19461af6cee579b66",
+                    "nonce" : "0xa9fd8fde1d2ebaa8",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4f105fc1684d90a92745c062f5d127a83e25fff98b0916b705f22fd216070f36",
+                    "stateRoot" : "0xcdc71928f3fd84b2dbb6e09aad781d1ec294f3f03731c33aa005a0e91944d50f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf9d72dbc52ce2b541067b4809db6a0ae37959408c7c162bcc64dd7c342bb052b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdc71928f3fd84b2dbb6e09aad781d1ec294f3f03731c33aa005a0e91944d50fa0f9d72dbc52ce2b541067b4809db6a0ae37959408c7c162bcc64dd7c342bb052ba04f105fc1684d90a92745c062f5d127a83e25fff98b0916b705f22fd216070f36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d18203e880a0783e733bf6afe766dfe79b0940443dcb8f31fbc8ad6cfbe19461af6cee579b6688a9fd8fde1d2ebaa8f8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ba0d6c015f16f2d5104d71f780e3c710dc7a00fcab03d6f13cbfe0f25a83b041b86a0579f6c3c8e9356a6da2c212e20bbfa5d32db73bf1b7cad71dc118b75c3c2056ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd6c015f16f2d5104d71f780e3c710dc7a00fcab03d6f13cbfe0f25a83b041b86",
+                        "s" : "0x579f6c3c8e9356a6da2c212e20bbfa5d32db73bf1b7cad71dc118b75c3c2056a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0d6b69285f35df9c1a5d7f3e9b2a17028727a232477ea717baffc8107ef66382",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d22g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g2v0Filler.json",
+            "sourceHash" : "83e70429d2669d8d37f6cc63f362baaddca8d2e6f3167f9d8ea4457dee19db32"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0xc6fab8d262e4e0f540610d3c9613b1f0f97b6f41e2a2b2b0a167b09a8f1c0e96",
+                    "mixHash" : "0xc7a3b4aff8f24de48c65b4cf315badc4711d299aabca89be79e651869ac2c278",
+                    "nonce" : "0xc9df7eb1ba10d701",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf9d72dbc52ce2b541067b4809db6a0ae37959408c7c162bcc64dd7c342bb052b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a0f9d72dbc52ce2b541067b4809db6a0ae37959408c7c162bcc64dd7c342bb052ba01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0c7a3b4aff8f24de48c65b4cf315badc4711d299aabca89be79e651869ac2c27888c9df7eb1ba10d701f8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ba0d6c015f16f2d5104d71f780e3c710dc7a00fcab03d6f13cbfe0f25a83b041b86a0579f6c3c8e9356a6da2c212e20bbfa5d32db73bf1b7cad71dc118b75c3c2056ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd6c015f16f2d5104d71f780e3c710dc7a00fcab03d6f13cbfe0f25a83b041b86",
+                        "s" : "0x579f6c3c8e9356a6da2c212e20bbfa5d32db73bf1b7cad71dc118b75c3c2056a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc6fab8d262e4e0f540610d3c9613b1f0f97b6f41e2a2b2b0a167b09a8f1c0e96",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d22g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g2v0Filler.json",
+            "sourceHash" : "83e70429d2669d8d37f6cc63f362baaddca8d2e6f3167f9d8ea4457dee19db32"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0xb4a7edc33de9435a4363ed93f00ed7e92aa76d6eaaadb669418676d032b9e618",
+                    "mixHash" : "0xddd88c8c7ce5c5b72274a87d927e67205d3684b33e2c574627f632b37efb3a67",
+                    "nonce" : "0x9179fdc56d574480",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf9d72dbc52ce2b541067b4809db6a0ae37959408c7c162bcc64dd7c342bb052b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a0f9d72dbc52ce2b541067b4809db6a0ae37959408c7c162bcc64dd7c342bb052ba01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0ddd88c8c7ce5c5b72274a87d927e67205d3684b33e2c574627f632b37efb3a67889179fdc56d574480f8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ba0d6c015f16f2d5104d71f780e3c710dc7a00fcab03d6f13cbfe0f25a83b041b86a0579f6c3c8e9356a6da2c212e20bbfa5d32db73bf1b7cad71dc118b75c3c2056ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd6c015f16f2d5104d71f780e3c710dc7a00fcab03d6f13cbfe0f25a83b041b86",
+                        "s" : "0x579f6c3c8e9356a6da2c212e20bbfa5d32db73bf1b7cad71dc118b75c3c2056a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb4a7edc33de9435a4363ed93f00ed7e92aa76d6eaaadb669418676d032b9e618",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g3v0.json
index 7a73a41bf..d718b325b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d22g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g3v0Filler.json",
+            "sourceHash" : "af6841a0ab0a78f29ee003386a134ad0ac0bc9e04c21f80324dfdfc7afe94a06"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d1",
+                    "hash" : "0x938fab61268ddb1f22822c37be1c88498cfbe1bc2c3304a8227f1f739102f03b",
+                    "mixHash" : "0x815ad139c7ecc4899b42c23942287b5b81bb64e225ec4eb5861a36ebdb6c2a95",
+                    "nonce" : "0x034545099c70f895",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4f105fc1684d90a92745c062f5d127a83e25fff98b0916b705f22fd216070f36",
+                    "stateRoot" : "0xcdc71928f3fd84b2dbb6e09aad781d1ec294f3f03731c33aa005a0e91944d50f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x810180cd80e6a647ebf633705896dbf3ef1aa02fe9e53f9f73409a30088ed8e7",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdc71928f3fd84b2dbb6e09aad781d1ec294f3f03731c33aa005a0e91944d50fa0810180cd80e6a647ebf633705896dbf3ef1aa02fe9e53f9f73409a30088ed8e7a04f105fc1684d90a92745c062f5d127a83e25fff98b0916b705f22fd216070f36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d18203e880a0815ad139c7ecc4899b42c23942287b5b81bb64e225ec4eb5861a36ebdb6c2a9588034545099c70f895f8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ba0109faca76ae4862f3c37771617323cda3ae317d086ba5dc5ce7a74cf5c664f1aa0081288ed40e7ef24e3f66977fd510b6a5d11619571be38e0efb80de9a84c617ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x109faca76ae4862f3c37771617323cda3ae317d086ba5dc5ce7a74cf5c664f1a",
+                        "s" : "0x081288ed40e7ef24e3f66977fd510b6a5d11619571be38e0efb80de9a84c617a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x938fab61268ddb1f22822c37be1c88498cfbe1bc2c3304a8227f1f739102f03b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9d1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d22g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g3v0Filler.json",
+            "sourceHash" : "af6841a0ab0a78f29ee003386a134ad0ac0bc9e04c21f80324dfdfc7afe94a06"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0x0b807705fa1f22ff9cfa9cf9ca1221045056dfd6cb26fd00eb31c8d8f5e56713",
+                    "mixHash" : "0x97f17879fe1494a1313b99075569ed46a3c0784357b1d88578d99f3f64c66031",
+                    "nonce" : "0x60c3bfcfd252d364",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x810180cd80e6a647ebf633705896dbf3ef1aa02fe9e53f9f73409a30088ed8e7",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a0810180cd80e6a647ebf633705896dbf3ef1aa02fe9e53f9f73409a30088ed8e7a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a097f17879fe1494a1313b99075569ed46a3c0784357b1d88578d99f3f64c660318860c3bfcfd252d364f8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ba0109faca76ae4862f3c37771617323cda3ae317d086ba5dc5ce7a74cf5c664f1aa0081288ed40e7ef24e3f66977fd510b6a5d11619571be38e0efb80de9a84c617ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x109faca76ae4862f3c37771617323cda3ae317d086ba5dc5ce7a74cf5c664f1a",
+                        "s" : "0x081288ed40e7ef24e3f66977fd510b6a5d11619571be38e0efb80de9a84c617a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0b807705fa1f22ff9cfa9cf9ca1221045056dfd6cb26fd00eb31c8d8f5e56713",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d22g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g3v0Filler.json",
+            "sourceHash" : "af6841a0ab0a78f29ee003386a134ad0ac0bc9e04c21f80324dfdfc7afe94a06"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0x72aa4e3bd2522087f0ed61e5363e5a6cc2a2517603c56764c821d825778db041",
+                    "mixHash" : "0x81346f1ed6501ca52dfe1846ebcb30ddc195515696b55351e371003e5ab1a699",
+                    "nonce" : "0x257c0a486ddc5170",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x810180cd80e6a647ebf633705896dbf3ef1aa02fe9e53f9f73409a30088ed8e7",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a0810180cd80e6a647ebf633705896dbf3ef1aa02fe9e53f9f73409a30088ed8e7a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a081346f1ed6501ca52dfe1846ebcb30ddc195515696b55351e371003e5ab1a69988257c0a486ddc5170f8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ba0109faca76ae4862f3c37771617323cda3ae317d086ba5dc5ce7a74cf5c664f1aa0081288ed40e7ef24e3f66977fd510b6a5d11619571be38e0efb80de9a84c617ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x109faca76ae4862f3c37771617323cda3ae317d086ba5dc5ce7a74cf5c664f1a",
+                        "s" : "0x081288ed40e7ef24e3f66977fd510b6a5d11619571be38e0efb80de9a84c617a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x72aa4e3bd2522087f0ed61e5363e5a6cc2a2517603c56764c821d825778db041",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g0v0.json
index 6fbcb2329..fa866fdd5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d23g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g0v0Filler.json",
             "sourceHash" : "282536cae107125936e65a99019982f633c469526dd523e936b2e92f54cc1978"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98b",
-                    "hash" : "0xed75afbb3ed8b8947383c4b22165ddfdd7f4d7c5bb2a9fc13de260b403f4de99",
-                    "mixHash" : "0x43ad0113c51840a99ec5e2b1c81a06e2b50c7b2fa520ac438eb9c571d2c68d0e",
-                    "nonce" : "0x2a85441f35bcb9d1",
+                    "hash" : "0x939e3e6ddbc08583c3441e294f403a833db86459c0a16dd1cd7eb4af0207d480",
+                    "mixHash" : "0xaded0cf5a34f3de4c05cebba6989c0ca487692f5c07378631413ba66d06e2609",
+                    "nonce" : "0x5580638c162004bb",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xd7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fc49b1d9808d8c6d5b1977f29b1833b446aff70da8a86a5737d5e354d1ae44ea0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a0d7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a043ad0113c51840a99ec5e2b1c81a06e2b50c7b2fa520ac438eb9c571d2c68d0e882a85441f35bcb9d1f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fc49b1d9808d8c6d5b1977f29b1833b446aff70da8a86a5737d5e354d1ae44ea0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a0d7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a0aded0cf5a34f3de4c05cebba6989c0ca487692f5c07378631413ba66d06e2609885580638c162004bbf8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed75afbb3ed8b8947383c4b22165ddfdd7f4d7c5bb2a9fc13de260b403f4de99",
+        "lastblockhash" : "0x939e3e6ddbc08583c3441e294f403a833db86459c0a16dd1cd7eb4af0207d480",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d23g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g0v0Filler.json",
             "sourceHash" : "282536cae107125936e65a99019982f633c469526dd523e936b2e92f54cc1978"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98b",
-                    "hash" : "0x10a0b3d03c9b3dfb946634340071fa8263161cbf4a3532c6c2943c9239825552",
-                    "mixHash" : "0x3d2fbd1c03adf431d7ba8a159fb3f3506d841f4b003304374ee9dbc3e470894a",
-                    "nonce" : "0x08bbce8e419c9bd0",
+                    "hash" : "0xb04dba7ef13ab710e47a19d761fbb41fddae15061cb7056756026844560f0868",
+                    "mixHash" : "0x57b0ac3fe9e8c31c1c9dfbc94ea96508f729b3812999e5b9ff2f3257923f38a8",
+                    "nonce" : "0xa1a66856895ab5ab",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0x491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a03d2fbd1c03adf431d7ba8a159fb3f3506d841f4b003304374ee9dbc3e470894a8808bbce8e419c9bd0f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a057b0ac3fe9e8c31c1c9dfbc94ea96508f729b3812999e5b9ff2f3257923f38a888a1a66856895ab5abf8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x10a0b3d03c9b3dfb946634340071fa8263161cbf4a3532c6c2943c9239825552",
+        "lastblockhash" : "0xb04dba7ef13ab710e47a19d761fbb41fddae15061cb7056756026844560f0868",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d23g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g0v0Filler.json",
             "sourceHash" : "282536cae107125936e65a99019982f633c469526dd523e936b2e92f54cc1978"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98b",
-                    "hash" : "0xd3b488ace5a87a77ebd355aa73f39561a4707d20131243f18afbed224ef54eed",
-                    "mixHash" : "0x29f407cb959c86c9a23b8392f8a22965e5884578dc26bf5d2b7d0465d90198d6",
-                    "nonce" : "0x850364c57a65e996",
+                    "hash" : "0x016aad8c6d2a1a00a0a6e98122324cfd5464f871020d82173067f542582f1793",
+                    "mixHash" : "0xc50bec6ad743005c1b1e6d7c6f511a615773ca3109c0c9ed77a379928ed883a8",
+                    "nonce" : "0x0b94df232eee1e0f",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0x491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a029f407cb959c86c9a23b8392f8a22965e5884578dc26bf5d2b7d0465d90198d688850364c57a65e996f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a0c50bec6ad743005c1b1e6d7c6f511a615773ca3109c0c9ed77a379928ed883a8880b94df232eee1e0ff8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3b488ace5a87a77ebd355aa73f39561a4707d20131243f18afbed224ef54eed",
+        "lastblockhash" : "0x016aad8c6d2a1a00a0a6e98122324cfd5464f871020d82173067f542582f1793",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g1v0.json
index 7a73a41bf..61ef8dee5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d23g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g1v0Filler.json",
+            "sourceHash" : "2cf9bbc4b891c12242636e55423aea53a21e53a9e170b928e3bc464674b4ca19"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0x0470707cb6ae6e71a0b6d290f29e7503346f9b97265648e900340397e7808902",
+                    "mixHash" : "0x3c081f00ffe823872c0b17ee98cbcded0bee0382a54e0f49eca89cececf37a42",
+                    "nonce" : "0xfa34b39d012a3929",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xd7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1",
+                    "stateRoot" : "0x0fc49b1d9808d8c6d5b1977f29b1833b446aff70da8a86a5737d5e354d1ae44e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x84af0b0d7198c9c26d253ee3d334619fc499483d37c5fdcc0d74d4cbad358bb2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fc49b1d9808d8c6d5b1977f29b1833b446aff70da8a86a5737d5e354d1ae44ea084af0b0d7198c9c26d253ee3d334619fc499483d37c5fdcc0d74d4cbad358bb2a0d7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a03c081f00ffe823872c0b17ee98cbcded0bee0382a54e0f49eca89cececf37a4288fa34b39d012a3929f8c4f8c2800183015f9094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0b2f7b27a44f97f0b5cf7de13069a86ae54b18a41276d347d5a9ad898a4b7e511a0725ce6ce4c45646544614c03317b42e21d1eac0486adff5365865b03b87cc2f5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb2f7b27a44f97f0b5cf7de13069a86ae54b18a41276d347d5a9ad898a4b7e511",
+                        "s" : "0x725ce6ce4c45646544614c03317b42e21d1eac0486adff5365865b03b87cc2f5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0470707cb6ae6e71a0b6d290f29e7503346f9b97265648e900340397e7808902",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d23g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g1v0Filler.json",
+            "sourceHash" : "2cf9bbc4b891c12242636e55423aea53a21e53a9e170b928e3bc464674b4ca19"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0x9698d86b0af30ab42ae225d95d22a55ebbb8320b79eadc46aa4de12fec02b9f2",
+                    "mixHash" : "0x4a909e2ebea2368e8bc968c1dd3f7553c23ac0f7c2418d8815d807807c5a9a5e",
+                    "nonce" : "0x681955dd36512d0c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x84af0b0d7198c9c26d253ee3d334619fc499483d37c5fdcc0d74d4cbad358bb2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a084af0b0d7198c9c26d253ee3d334619fc499483d37c5fdcc0d74d4cbad358bb2a0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a04a909e2ebea2368e8bc968c1dd3f7553c23ac0f7c2418d8815d807807c5a9a5e88681955dd36512d0cf8c4f8c2800183015f9094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0b2f7b27a44f97f0b5cf7de13069a86ae54b18a41276d347d5a9ad898a4b7e511a0725ce6ce4c45646544614c03317b42e21d1eac0486adff5365865b03b87cc2f5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb2f7b27a44f97f0b5cf7de13069a86ae54b18a41276d347d5a9ad898a4b7e511",
+                        "s" : "0x725ce6ce4c45646544614c03317b42e21d1eac0486adff5365865b03b87cc2f5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9698d86b0af30ab42ae225d95d22a55ebbb8320b79eadc46aa4de12fec02b9f2",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d23g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g1v0Filler.json",
+            "sourceHash" : "2cf9bbc4b891c12242636e55423aea53a21e53a9e170b928e3bc464674b4ca19"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0x7b31c965add620577e954f90c8babe75606d812a4a92663a5964cbe512a0ccfd",
+                    "mixHash" : "0x3211db8a0de3364ba5414e63aaf1a2d25ddc96e701e5d0f8140dd3856a67690c",
+                    "nonce" : "0x57fc3c88c8268fec",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x84af0b0d7198c9c26d253ee3d334619fc499483d37c5fdcc0d74d4cbad358bb2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a084af0b0d7198c9c26d253ee3d334619fc499483d37c5fdcc0d74d4cbad358bb2a0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a03211db8a0de3364ba5414e63aaf1a2d25ddc96e701e5d0f8140dd3856a67690c8857fc3c88c8268fecf8c4f8c2800183015f9094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0b2f7b27a44f97f0b5cf7de13069a86ae54b18a41276d347d5a9ad898a4b7e511a0725ce6ce4c45646544614c03317b42e21d1eac0486adff5365865b03b87cc2f5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb2f7b27a44f97f0b5cf7de13069a86ae54b18a41276d347d5a9ad898a4b7e511",
+                        "s" : "0x725ce6ce4c45646544614c03317b42e21d1eac0486adff5365865b03b87cc2f5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7b31c965add620577e954f90c8babe75606d812a4a92663a5964cbe512a0ccfd",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g2v0.json
index 7a73a41bf..0a9f417b5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d23g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g2v0Filler.json",
+            "sourceHash" : "7fe1fb2635d9d058f6e2e7edb9fd4dae01ab24340b945fddf7e0e15e137d2164"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0x4c7ad7c5ed48ce3816850f3885ed27f33ef6e3664491f588220937cda615b953",
+                    "mixHash" : "0x17211a4bb2d7eead2cac586f6d8dc17f571739154b800b74e8fc17a0aa88a42f",
+                    "nonce" : "0x14a73bb2380fbcc6",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xd7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1",
+                    "stateRoot" : "0x0fc49b1d9808d8c6d5b1977f29b1833b446aff70da8a86a5737d5e354d1ae44e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x36c7e672eb880f1728a33860fd2a20afb188736cb69c0061995a9c25f83642ba",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fc49b1d9808d8c6d5b1977f29b1833b446aff70da8a86a5737d5e354d1ae44ea036c7e672eb880f1728a33860fd2a20afb188736cb69c0061995a9c25f83642baa0d7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a017211a4bb2d7eead2cac586f6d8dc17f571739154b800b74e8fc17a0aa88a42f8814a73bb2380fbcc6f8c4f8c280018301adb094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ba05dade6bc4adef9433d62e87957cb36c7d5846cae18e7ecf1cc2135e904968a86a029f775508fe1f62df5328498e9418a1840c33c868e18601f309b727f683e9006c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5dade6bc4adef9433d62e87957cb36c7d5846cae18e7ecf1cc2135e904968a86",
+                        "s" : "0x29f775508fe1f62df5328498e9418a1840c33c868e18601f309b727f683e9006",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4c7ad7c5ed48ce3816850f3885ed27f33ef6e3664491f588220937cda615b953",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d23g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g2v0Filler.json",
+            "sourceHash" : "7fe1fb2635d9d058f6e2e7edb9fd4dae01ab24340b945fddf7e0e15e137d2164"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0xa959d1392f2e94de6fe077d2f4f021748e9363e49e109d99bf6483ede97354de",
+                    "mixHash" : "0x5048beda46645b83d9fa49ca4b0fe8a38c6e46ed3818237fb942216581896f92",
+                    "nonce" : "0x21a38b61bef2c97e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x36c7e672eb880f1728a33860fd2a20afb188736cb69c0061995a9c25f83642ba",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a036c7e672eb880f1728a33860fd2a20afb188736cb69c0061995a9c25f83642baa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a05048beda46645b83d9fa49ca4b0fe8a38c6e46ed3818237fb942216581896f928821a38b61bef2c97ef8c4f8c280018301adb094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ba05dade6bc4adef9433d62e87957cb36c7d5846cae18e7ecf1cc2135e904968a86a029f775508fe1f62df5328498e9418a1840c33c868e18601f309b727f683e9006c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5dade6bc4adef9433d62e87957cb36c7d5846cae18e7ecf1cc2135e904968a86",
+                        "s" : "0x29f775508fe1f62df5328498e9418a1840c33c868e18601f309b727f683e9006",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa959d1392f2e94de6fe077d2f4f021748e9363e49e109d99bf6483ede97354de",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d23g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g2v0Filler.json",
+            "sourceHash" : "7fe1fb2635d9d058f6e2e7edb9fd4dae01ab24340b945fddf7e0e15e137d2164"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0xfa6ebd798fad2b7573c89623ff5938352f61635a6873a249d61c3bc94c947a5f",
+                    "mixHash" : "0x474ca222d6fd6c66da8528a9c2b654f7590a5d0c8a7821fc8ff20b3d6b64d144",
+                    "nonce" : "0x9a4f412f35f1a542",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x36c7e672eb880f1728a33860fd2a20afb188736cb69c0061995a9c25f83642ba",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a036c7e672eb880f1728a33860fd2a20afb188736cb69c0061995a9c25f83642baa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a0474ca222d6fd6c66da8528a9c2b654f7590a5d0c8a7821fc8ff20b3d6b64d144889a4f412f35f1a542f8c4f8c280018301adb094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ba05dade6bc4adef9433d62e87957cb36c7d5846cae18e7ecf1cc2135e904968a86a029f775508fe1f62df5328498e9418a1840c33c868e18601f309b727f683e9006c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5dade6bc4adef9433d62e87957cb36c7d5846cae18e7ecf1cc2135e904968a86",
+                        "s" : "0x29f775508fe1f62df5328498e9418a1840c33c868e18601f309b727f683e9006",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfa6ebd798fad2b7573c89623ff5938352f61635a6873a249d61c3bc94c947a5f",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g3v0.json
index 7a73a41bf..84426681b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d23g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g3v0Filler.json",
+            "sourceHash" : "0040d5f9bdd18543fc5afb3d01426f54ae1ae6909aac000e29e57e1fe9a3fd84"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0xc4bb2948956d75d94e3f97e66df6bee3681160b31c85fcc055ff41b6bce61812",
+                    "mixHash" : "0xa75b547f2eb20f751c900f66ab3b3d313a0f48d34dec62c168eac2dbf1756f7a",
+                    "nonce" : "0x1c350101e6041b0f",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xd7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1",
+                    "stateRoot" : "0x0fc49b1d9808d8c6d5b1977f29b1833b446aff70da8a86a5737d5e354d1ae44e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd8fc2806d0613f1b15e3f4342f2446f740130b67ab1a2147b6ac2fcf9296736f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fc49b1d9808d8c6d5b1977f29b1833b446aff70da8a86a5737d5e354d1ae44ea0d8fc2806d0613f1b15e3f4342f2446f740130b67ab1a2147b6ac2fcf9296736fa0d7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a0a75b547f2eb20f751c900f66ab3b3d313a0f48d34dec62c168eac2dbf1756f7a881c350101e6041b0ff8c4f8c2800183030d4094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0b8d790d88f7a22d2920a213cc1316529b9b61eca31f2791e9c23a475374ae1b8a07e8e89aac6dfb5e77a1ff73b1507520ab1990089eafecb7e6921802eb19cb339c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb8d790d88f7a22d2920a213cc1316529b9b61eca31f2791e9c23a475374ae1b8",
+                        "s" : "0x7e8e89aac6dfb5e77a1ff73b1507520ab1990089eafecb7e6921802eb19cb339",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc4bb2948956d75d94e3f97e66df6bee3681160b31c85fcc055ff41b6bce61812",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d23g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g3v0Filler.json",
+            "sourceHash" : "0040d5f9bdd18543fc5afb3d01426f54ae1ae6909aac000e29e57e1fe9a3fd84"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0xd61831741e8ae67110ea36d52438de4222e18ec7d34db63236fb8bcb79b18890",
+                    "mixHash" : "0x54297c942976cc95defbbe0db08809d1bf4047fcbac395010963fcc2a134b082",
+                    "nonce" : "0x2905db027fd945aa",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd8fc2806d0613f1b15e3f4342f2446f740130b67ab1a2147b6ac2fcf9296736f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0d8fc2806d0613f1b15e3f4342f2446f740130b67ab1a2147b6ac2fcf9296736fa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a054297c942976cc95defbbe0db08809d1bf4047fcbac395010963fcc2a134b082882905db027fd945aaf8c4f8c2800183030d4094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0b8d790d88f7a22d2920a213cc1316529b9b61eca31f2791e9c23a475374ae1b8a07e8e89aac6dfb5e77a1ff73b1507520ab1990089eafecb7e6921802eb19cb339c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb8d790d88f7a22d2920a213cc1316529b9b61eca31f2791e9c23a475374ae1b8",
+                        "s" : "0x7e8e89aac6dfb5e77a1ff73b1507520ab1990089eafecb7e6921802eb19cb339",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd61831741e8ae67110ea36d52438de4222e18ec7d34db63236fb8bcb79b18890",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d23g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g3v0Filler.json",
+            "sourceHash" : "0040d5f9bdd18543fc5afb3d01426f54ae1ae6909aac000e29e57e1fe9a3fd84"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0xad851ad085cd395a8d1c30b97be7f9087080744a8aa3d1e1c6811a7e3aecbff1",
+                    "mixHash" : "0x003c8229bb0f9e57fb449352e9a239c87e82bb5d8260113ec4c18dca0e7b3179",
+                    "nonce" : "0x4fa049c79c434f94",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd8fc2806d0613f1b15e3f4342f2446f740130b67ab1a2147b6ac2fcf9296736f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0d8fc2806d0613f1b15e3f4342f2446f740130b67ab1a2147b6ac2fcf9296736fa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a0003c8229bb0f9e57fb449352e9a239c87e82bb5d8260113ec4c18dca0e7b3179884fa049c79c434f94f8c4f8c2800183030d4094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0b8d790d88f7a22d2920a213cc1316529b9b61eca31f2791e9c23a475374ae1b8a07e8e89aac6dfb5e77a1ff73b1507520ab1990089eafecb7e6921802eb19cb339c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb8d790d88f7a22d2920a213cc1316529b9b61eca31f2791e9c23a475374ae1b8",
+                        "s" : "0x7e8e89aac6dfb5e77a1ff73b1507520ab1990089eafecb7e6921802eb19cb339",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xad851ad085cd395a8d1c30b97be7f9087080744a8aa3d1e1c6811a7e3aecbff1",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g0v0.json
index 2864d3438..31b28f2f9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d24g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g0v0Filler.json",
             "sourceHash" : "fa6dce120ad8e6e94f1337ba35ec8c345607bd33280d8fdf6124548cd629411d"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb944",
-                    "hash" : "0x9f0d0287081884687b82088ede3345e9dfd7ca33235c8f620bd0fca0ef4383c6",
-                    "mixHash" : "0xa8f570b3bb0c7f71d15f1ee6ead08018523e9fc0a9dece24984f891a66c7199e",
-                    "nonce" : "0x8f47e96ec5a332d7",
+                    "hash" : "0x76143cdec39b0435fef69f29bd90c980a5e1b03b6ae8e67a03d09e54b534da15",
+                    "mixHash" : "0x5c03d46211728d0451ee27f346a68506069c0d85c4e54ac1cd87a7dad0c60d76",
+                    "nonce" : "0x385773ec4ebe0908",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x99d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x9332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ec4dd19d3cf62815af0f8786c1c4cd3d36aedeba10c6112cfd2644697cceca3a09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a099d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a0a8f570b3bb0c7f71d15f1ee6ead08018523e9fc0a9dece24984f891a66c7199e888f47e96ec5a332d7f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ec4dd19d3cf62815af0f8786c1c4cd3d36aedeba10c6112cfd2644697cceca3a09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a099d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a05c03d46211728d0451ee27f346a68506069c0d85c4e54ac1cd87a7dad0c60d7688385773ec4ebe0908f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f0d0287081884687b82088ede3345e9dfd7ca33235c8f620bd0fca0ef4383c6",
+        "lastblockhash" : "0x76143cdec39b0435fef69f29bd90c980a5e1b03b6ae8e67a03d09e54b534da15",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d24g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g0v0Filler.json",
             "sourceHash" : "fa6dce120ad8e6e94f1337ba35ec8c345607bd33280d8fdf6124548cd629411d"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb944",
-                    "hash" : "0xf9f647db0c404b777e015cd07ff971c65487eb7cbf1a5ed3bbfad1434dd14d2b",
-                    "mixHash" : "0xbc79e3d0c3b108797efe84951d353cedf6ff3ba037650ed601502b561acdc0da",
-                    "nonce" : "0x067ca2d656f13ff1",
+                    "hash" : "0x43c4db3184ed0701cc83fa1f565f249a7e7c30ed192ecbb39c688c43f953c0a0",
+                    "mixHash" : "0xf9be62329b1142b0193aeacc6a7153688ac6e605cf92866c1fefc4c706979483",
+                    "nonce" : "0x17302eb6a0ebe908",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xbab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5e",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0x9332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a0bc79e3d0c3b108797efe84951d353cedf6ff3ba037650ed601502b561acdc0da88067ca2d656f13ff1f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a0f9be62329b1142b0193aeacc6a7153688ac6e605cf92866c1fefc4c7069794838817302eb6a0ebe908f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9f647db0c404b777e015cd07ff971c65487eb7cbf1a5ed3bbfad1434dd14d2b",
+        "lastblockhash" : "0x43c4db3184ed0701cc83fa1f565f249a7e7c30ed192ecbb39c688c43f953c0a0",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d24g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g0v0Filler.json",
             "sourceHash" : "fa6dce120ad8e6e94f1337ba35ec8c345607bd33280d8fdf6124548cd629411d"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb944",
-                    "hash" : "0xbfab7f599cf615591282b8fab80943e41eef033f0e4273a4bcc02c9801338269",
-                    "mixHash" : "0x9026fa86b62a97d3ce356313e28cbc299e1b96a5c6d84094a69b508996abda5e",
-                    "nonce" : "0x4817e056279529b0",
+                    "hash" : "0x60dca0b0a402137b62bc43bd33de2d16d47632d8ffd7e57be36c58a28960cfce",
+                    "mixHash" : "0x60bb572689a570a621fd855353189709bd2876ff96835d6e958f997be2053ecc",
+                    "nonce" : "0xa5cd27c3d8c15728",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xbab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5e",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0x9332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a09026fa86b62a97d3ce356313e28cbc299e1b96a5c6d84094a69b508996abda5e884817e056279529b0f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a060bb572689a570a621fd855353189709bd2876ff96835d6e958f997be2053ecc88a5cd27c3d8c15728f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbfab7f599cf615591282b8fab80943e41eef033f0e4273a4bcc02c9801338269",
+        "lastblockhash" : "0x60dca0b0a402137b62bc43bd33de2d16d47632d8ffd7e57be36c58a28960cfce",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g1v0.json
index 7a73a41bf..5e9306af5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d24g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g1v0Filler.json",
+            "sourceHash" : "18ee82550d281a96814021ac9d8b251bded423a77ac1bffd0c48c92a9f666744"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb944",
+                    "hash" : "0x48b0622d10f3223661bd2e889e7dad402eb481e639b046e00184c6808f41b753",
+                    "mixHash" : "0x6fa0dca687d2223fb0a895f975b368c2981cc387ef92de2f0dc5748b95acde63",
+                    "nonce" : "0x7680da3979a408f3",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x99d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22",
+                    "stateRoot" : "0x4ec4dd19d3cf62815af0f8786c1c4cd3d36aedeba10c6112cfd2644697cceca3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa8f0f62face750933455ba579948da9c49f357f91bf331b3f710e851990ca054",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ec4dd19d3cf62815af0f8786c1c4cd3d36aedeba10c6112cfd2644697cceca3a0a8f0f62face750933455ba579948da9c49f357f91bf331b3f710e851990ca054a099d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a06fa0dca687d2223fb0a895f975b368c2981cc387ef92de2f0dc5748b95acde63887680da3979a408f3f8c3f8c1800183015f9094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba01a0350c3d9a923aff3c2051598f8b1b60f9ec1d85463b175d17814822b382f04a07492756090062da7dbc308d41f1f0fcb4052e5244bd5b60acac76d4138de9372c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a0350c3d9a923aff3c2051598f8b1b60f9ec1d85463b175d17814822b382f04",
+                        "s" : "0x7492756090062da7dbc308d41f1f0fcb4052e5244bd5b60acac76d4138de9372",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x48b0622d10f3223661bd2e889e7dad402eb481e639b046e00184c6808f41b753",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb944",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46bc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d24g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g1v0Filler.json",
+            "sourceHash" : "18ee82550d281a96814021ac9d8b251bded423a77ac1bffd0c48c92a9f666744"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb944",
+                    "hash" : "0xa8097b6a33cec463e51e96e81a9400054b0d8ef0de0faacc13a5bf14a7b857c9",
+                    "mixHash" : "0x3b77f41018ff28af1464ada90ad7d4e60eed395456b0841b29ab1e921df726fd",
+                    "nonce" : "0x0f1011e306f4dae9",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xbab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5e",
+                    "stateRoot" : "0x520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa8f0f62face750933455ba579948da9c49f357f91bf331b3f710e851990ca054",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da0a8f0f62face750933455ba579948da9c49f357f91bf331b3f710e851990ca054a0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a03b77f41018ff28af1464ada90ad7d4e60eed395456b0841b29ab1e921df726fd880f1011e306f4dae9f8c3f8c1800183015f9094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba01a0350c3d9a923aff3c2051598f8b1b60f9ec1d85463b175d17814822b382f04a07492756090062da7dbc308d41f1f0fcb4052e5244bd5b60acac76d4138de9372c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a0350c3d9a923aff3c2051598f8b1b60f9ec1d85463b175d17814822b382f04",
+                        "s" : "0x7492756090062da7dbc308d41f1f0fcb4052e5244bd5b60acac76d4138de9372",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa8097b6a33cec463e51e96e81a9400054b0d8ef0de0faacc13a5bf14a7b857c9",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b944",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46bc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d24g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g1v0Filler.json",
+            "sourceHash" : "18ee82550d281a96814021ac9d8b251bded423a77ac1bffd0c48c92a9f666744"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb944",
+                    "hash" : "0xa4f9698f58776a3a414aaa6f89e9c5523ab25f36abfaf5e84b1478fcb65fd701",
+                    "mixHash" : "0xf243b1a22cbd3bcd2d6dab3295953a5179e46ea89751bf987544a2dee6b5ae66",
+                    "nonce" : "0x6a157d12fa6f8208",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xbab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5e",
+                    "stateRoot" : "0x520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa8f0f62face750933455ba579948da9c49f357f91bf331b3f710e851990ca054",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da0a8f0f62face750933455ba579948da9c49f357f91bf331b3f710e851990ca054a0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a0f243b1a22cbd3bcd2d6dab3295953a5179e46ea89751bf987544a2dee6b5ae66886a157d12fa6f8208f8c3f8c1800183015f9094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba01a0350c3d9a923aff3c2051598f8b1b60f9ec1d85463b175d17814822b382f04a07492756090062da7dbc308d41f1f0fcb4052e5244bd5b60acac76d4138de9372c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a0350c3d9a923aff3c2051598f8b1b60f9ec1d85463b175d17814822b382f04",
+                        "s" : "0x7492756090062da7dbc308d41f1f0fcb4052e5244bd5b60acac76d4138de9372",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa4f9698f58776a3a414aaa6f89e9c5523ab25f36abfaf5e84b1478fcb65fd701",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b944",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46bc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g2v0.json
index 7a73a41bf..69324a270 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d24g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g2v0Filler.json",
+            "sourceHash" : "f6646572df4a60681059b950ac8b657386068e73141720897ba2f552bea185d7"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb944",
+                    "hash" : "0x8244503f0daaf0a298282032f76bb71fac1e3681e18178be3e0df868dcc492e0",
+                    "mixHash" : "0x65aff119f5738a0769bbab744fa231fdbe6505bffdf3f11d61b101d7905a2524",
+                    "nonce" : "0x4bf209e85893fb80",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x99d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22",
+                    "stateRoot" : "0x4ec4dd19d3cf62815af0f8786c1c4cd3d36aedeba10c6112cfd2644697cceca3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe7c1f21aa11f68e8bfb21a7f29c160b54d91c51aa6ea397455a64526603985ea",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ec4dd19d3cf62815af0f8786c1c4cd3d36aedeba10c6112cfd2644697cceca3a0e7c1f21aa11f68e8bfb21a7f29c160b54d91c51aa6ea397455a64526603985eaa099d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a065aff119f5738a0769bbab744fa231fdbe6505bffdf3f11d61b101d7905a2524884bf209e85893fb80f8c3f8c180018301adb094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba03c7a2b711c4207551bd9c05f97b51f288a28b6ee52d697aa5f6e0f3a3b168bdea06ecbb1949128261f599fdee2b62ac7e2096f7db85c12ba2bb2a09916fece7143c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c7a2b711c4207551bd9c05f97b51f288a28b6ee52d697aa5f6e0f3a3b168bde",
+                        "s" : "0x6ecbb1949128261f599fdee2b62ac7e2096f7db85c12ba2bb2a09916fece7143",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8244503f0daaf0a298282032f76bb71fac1e3681e18178be3e0df868dcc492e0",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb944",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46bc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d24g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g2v0Filler.json",
+            "sourceHash" : "f6646572df4a60681059b950ac8b657386068e73141720897ba2f552bea185d7"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb944",
+                    "hash" : "0xdd6a34e2b0dc0e192eb12598d47888bb5e5a406d79c70c7da1a8b4591061875e",
+                    "mixHash" : "0x677628e6b469a3e679f3465a460627ae1d8e210eb233beffeb9c4607d44e536a",
+                    "nonce" : "0xce22d2c2718ecca1",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xbab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5e",
+                    "stateRoot" : "0x520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe7c1f21aa11f68e8bfb21a7f29c160b54d91c51aa6ea397455a64526603985ea",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da0e7c1f21aa11f68e8bfb21a7f29c160b54d91c51aa6ea397455a64526603985eaa0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a0677628e6b469a3e679f3465a460627ae1d8e210eb233beffeb9c4607d44e536a88ce22d2c2718ecca1f8c3f8c180018301adb094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba03c7a2b711c4207551bd9c05f97b51f288a28b6ee52d697aa5f6e0f3a3b168bdea06ecbb1949128261f599fdee2b62ac7e2096f7db85c12ba2bb2a09916fece7143c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c7a2b711c4207551bd9c05f97b51f288a28b6ee52d697aa5f6e0f3a3b168bde",
+                        "s" : "0x6ecbb1949128261f599fdee2b62ac7e2096f7db85c12ba2bb2a09916fece7143",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdd6a34e2b0dc0e192eb12598d47888bb5e5a406d79c70c7da1a8b4591061875e",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b944",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46bc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d24g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g2v0Filler.json",
+            "sourceHash" : "f6646572df4a60681059b950ac8b657386068e73141720897ba2f552bea185d7"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb944",
+                    "hash" : "0x91c9652e11c2af579f620db4a62fdfb47c19d47c51e329c87eaca918659dbe1e",
+                    "mixHash" : "0x86da6fb0e8ca610356fd8d2312a0903050962453147d31e75331eff036ae4dd5",
+                    "nonce" : "0xfff638810df58474",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xbab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5e",
+                    "stateRoot" : "0x520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe7c1f21aa11f68e8bfb21a7f29c160b54d91c51aa6ea397455a64526603985ea",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da0e7c1f21aa11f68e8bfb21a7f29c160b54d91c51aa6ea397455a64526603985eaa0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a086da6fb0e8ca610356fd8d2312a0903050962453147d31e75331eff036ae4dd588fff638810df58474f8c3f8c180018301adb094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba03c7a2b711c4207551bd9c05f97b51f288a28b6ee52d697aa5f6e0f3a3b168bdea06ecbb1949128261f599fdee2b62ac7e2096f7db85c12ba2bb2a09916fece7143c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c7a2b711c4207551bd9c05f97b51f288a28b6ee52d697aa5f6e0f3a3b168bde",
+                        "s" : "0x6ecbb1949128261f599fdee2b62ac7e2096f7db85c12ba2bb2a09916fece7143",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x91c9652e11c2af579f620db4a62fdfb47c19d47c51e329c87eaca918659dbe1e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b944",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46bc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g3v0.json
index 7a73a41bf..4006720f8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d24g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g3v0Filler.json",
+            "sourceHash" : "f2a542e5c7c4e9be4e6a0b49477c60680c563dd82ac1d591b625dcfee426b9a4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb944",
+                    "hash" : "0x083c7764ee5f470a8a57140e862f721b6d4101ddeb0374cf978c4e6160809f4e",
+                    "mixHash" : "0xf5887263d135106ccde8bda11b7bae40713ad5dc93c469c7b1d9e992f356b4ef",
+                    "nonce" : "0x2ea55d3043539683",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x99d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22",
+                    "stateRoot" : "0x4ec4dd19d3cf62815af0f8786c1c4cd3d36aedeba10c6112cfd2644697cceca3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf8a1a9bc52eaa307fa1e43ad2eee928314838b8de81878a2492abaceebb64057",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ec4dd19d3cf62815af0f8786c1c4cd3d36aedeba10c6112cfd2644697cceca3a0f8a1a9bc52eaa307fa1e43ad2eee928314838b8de81878a2492abaceebb64057a099d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a0f5887263d135106ccde8bda11b7bae40713ad5dc93c469c7b1d9e992f356b4ef882ea55d3043539683f8c3f8c1800183030d4094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba0d724299deb1ba4778714cb9b52be7123b49c83c04a0281bfe50ba751f227f66ea039c4fabdf1800a29600ae425fb481a1652795100b4cede6743fbcd876330c649c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd724299deb1ba4778714cb9b52be7123b49c83c04a0281bfe50ba751f227f66e",
+                        "s" : "0x39c4fabdf1800a29600ae425fb481a1652795100b4cede6743fbcd876330c649",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x083c7764ee5f470a8a57140e862f721b6d4101ddeb0374cf978c4e6160809f4e",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb944",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46bc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d24g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g3v0Filler.json",
+            "sourceHash" : "f2a542e5c7c4e9be4e6a0b49477c60680c563dd82ac1d591b625dcfee426b9a4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb944",
+                    "hash" : "0x033dd0ea4c4823f321802a72dde77cf997baaa39429c7023f46c3494a836a4b9",
+                    "mixHash" : "0x3876046b15dcd7642cb91068745fd03cddc3d470da91f5dc8f76dd33ba82d284",
+                    "nonce" : "0x46aed656601df9ff",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xbab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5e",
+                    "stateRoot" : "0x520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf8a1a9bc52eaa307fa1e43ad2eee928314838b8de81878a2492abaceebb64057",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da0f8a1a9bc52eaa307fa1e43ad2eee928314838b8de81878a2492abaceebb64057a0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a03876046b15dcd7642cb91068745fd03cddc3d470da91f5dc8f76dd33ba82d2848846aed656601df9fff8c3f8c1800183030d4094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba0d724299deb1ba4778714cb9b52be7123b49c83c04a0281bfe50ba751f227f66ea039c4fabdf1800a29600ae425fb481a1652795100b4cede6743fbcd876330c649c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd724299deb1ba4778714cb9b52be7123b49c83c04a0281bfe50ba751f227f66e",
+                        "s" : "0x39c4fabdf1800a29600ae425fb481a1652795100b4cede6743fbcd876330c649",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x033dd0ea4c4823f321802a72dde77cf997baaa39429c7023f46c3494a836a4b9",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b944",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46bc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d24g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g3v0Filler.json",
+            "sourceHash" : "f2a542e5c7c4e9be4e6a0b49477c60680c563dd82ac1d591b625dcfee426b9a4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb944",
+                    "hash" : "0xed36894f373a89909b04b4c964fe5671fd2b7a84f9968866656fc02a2d95efb0",
+                    "mixHash" : "0xb808d519b6fc1e79f33f791a3b86ac7a73bb1e57584abd742d838ff9e2d8d8d9",
+                    "nonce" : "0x37b505e08656ee65",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xbab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5e",
+                    "stateRoot" : "0x520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf8a1a9bc52eaa307fa1e43ad2eee928314838b8de81878a2492abaceebb64057",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da0f8a1a9bc52eaa307fa1e43ad2eee928314838b8de81878a2492abaceebb64057a0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a0b808d519b6fc1e79f33f791a3b86ac7a73bb1e57584abd742d838ff9e2d8d8d98837b505e08656ee65f8c3f8c1800183030d4094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba0d724299deb1ba4778714cb9b52be7123b49c83c04a0281bfe50ba751f227f66ea039c4fabdf1800a29600ae425fb481a1652795100b4cede6743fbcd876330c649c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd724299deb1ba4778714cb9b52be7123b49c83c04a0281bfe50ba751f227f66e",
+                        "s" : "0x39c4fabdf1800a29600ae425fb481a1652795100b4cede6743fbcd876330c649",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xed36894f373a89909b04b4c964fe5671fd2b7a84f9968866656fc02a2d95efb0",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b944",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46bc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g0v0.json
index 1b2316783..fa0c6124f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d25g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g0v0Filler.json",
             "sourceHash" : "3d90e462499c9970c2192dbf4138ed11d4acb7cfe0374e46e61a933221e39097"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf4fa",
-                    "hash" : "0x947e43eaa5502f614a6044a9ffeeba6de6d15a01761349bf16be1b18c7bc0422",
-                    "mixHash" : "0xdc12bf4571a89c7fb77df7ffad377920aa8c5cf1be51cef018286f787a1e9669",
-                    "nonce" : "0xa67a53e056f4423b",
+                    "hash" : "0xf79b1ab43cb6b306a9bb89385119f3054001360a810a3be30b5b60e4f12ddc59",
+                    "mixHash" : "0xf037552dab65642f3bef0cd591c9c381b987e897d3bfb47ffed6bc79cc8aceb7",
+                    "nonce" : "0x0a4a6a45ca2d141b",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x45f5458f715598bd69ac6b1682455926ea43fe09954dcb901442155e77ed8091",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xfa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b11bd14605cdcd2e1e8e60ac67a0849d81c70ada69821cfb42fe3156a9d0e470a0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da045f5458f715598bd69ac6b1682455926ea43fe09954dcb901442155e77ed8091b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4fa8203e880a0dc12bf4571a89c7fb77df7ffad377920aa8c5cf1be51cef018286f787a1e966988a67a53e056f4423bf8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
+                "rlp" : "0xf902c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b11bd14605cdcd2e1e8e60ac67a0849d81c70ada69821cfb42fe3156a9d0e470a0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da045f5458f715598bd69ac6b1682455926ea43fe09954dcb901442155e77ed8091b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4fa8203e880a0f037552dab65642f3bef0cd591c9c381b987e897d3bfb47ffed6bc79cc8aceb7880a4a6a45ca2d141bf8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x947e43eaa5502f614a6044a9ffeeba6de6d15a01761349bf16be1b18c7bc0422",
+        "lastblockhash" : "0xf79b1ab43cb6b306a9bb89385119f3054001360a810a3be30b5b60e4f12ddc59",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d25g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g0v0Filler.json",
             "sourceHash" : "3d90e462499c9970c2192dbf4138ed11d4acb7cfe0374e46e61a933221e39097"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba5f",
-                    "hash" : "0xa0eaf406750a7f8ee794681e6fe97cd128b91908d75875f0bf93ba6633cd345b",
-                    "mixHash" : "0x461ff447b04a23bd5026374473f7511e6828f8fa4b8973e7e9ee05b039fb6ea1",
-                    "nonce" : "0x76a3b82bd50eb8e4",
+                    "hash" : "0xd3bd8a1a7aa573688e8f8f9d8362a52968a5f8f4d45cfefe78a1168295154bf7",
+                    "mixHash" : "0x0a46c4e4e22c92cac86666caabb75535adb6bf34c994ecccb0942c39cc151575",
+                    "nonce" : "0xba0112abe74996ee",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xc954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0xfa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a0461ff447b04a23bd5026374473f7511e6828f8fa4b8973e7e9ee05b039fb6ea18876a3b82bd50eb8e4f8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
+                "rlp" : "0xf902c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a00a46c4e4e22c92cac86666caabb75535adb6bf34c994ecccb0942c39cc15157588ba0112abe74996eef8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0eaf406750a7f8ee794681e6fe97cd128b91908d75875f0bf93ba6633cd345b",
+        "lastblockhash" : "0xd3bd8a1a7aa573688e8f8f9d8362a52968a5f8f4d45cfefe78a1168295154bf7",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d25g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g0v0Filler.json",
             "sourceHash" : "3d90e462499c9970c2192dbf4138ed11d4acb7cfe0374e46e61a933221e39097"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba5f",
-                    "hash" : "0xbaa5bad67d30d85812eb9bfc767abd435af93d737e9a8da6ebfaa914526a3de1",
-                    "mixHash" : "0x23bad1562221c9ac5642434a0e3de58da9393f394c4b02008233a5b23ce105e7",
-                    "nonce" : "0xc32c742a741a099b",
+                    "hash" : "0xbdb1038b3aaff6c55eb337845f26be077a0c6a623f4fb33da9d7e852771ed016",
+                    "mixHash" : "0x453cc395597b51d4613448ceb9ffa96445a37ce2e37d74fc974e087d387fdaa5",
+                    "nonce" : "0x3db02c7008fb44f1",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xc954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0xfa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a023bad1562221c9ac5642434a0e3de58da9393f394c4b02008233a5b23ce105e788c32c742a741a099bf8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
+                "rlp" : "0xf902c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a0453cc395597b51d4613448ceb9ffa96445a37ce2e37d74fc974e087d387fdaa5883db02c7008fb44f1f8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbaa5bad67d30d85812eb9bfc767abd435af93d737e9a8da6ebfaa914526a3de1",
+        "lastblockhash" : "0xbdb1038b3aaff6c55eb337845f26be077a0c6a623f4fb33da9d7e852771ed016",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g1v0.json
index 7a73a41bf..47dbcb1ce 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g1v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d25g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g1v0Filler.json",
+            "sourceHash" : "c48bd492ffc55d826da22f8054929560e8ebc383728da8e7d624c1e581f51951"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4fa",
+                    "hash" : "0x072d14e12201d34f9105be89233178fe35afa4cc2efe277604b6848613b03657",
+                    "mixHash" : "0x4e3ea02da5f0991dd671dfaef7ccd807c3407558cfedd5d9905a8b2f43244e1d",
+                    "nonce" : "0xe2e323bb9366e4a6",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x45f5458f715598bd69ac6b1682455926ea43fe09954dcb901442155e77ed8091",
+                    "stateRoot" : "0xb11bd14605cdcd2e1e8e60ac67a0849d81c70ada69821cfb42fe3156a9d0e470",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x71ce21d0d6685683c59e355c0acc1e351158d883cdda0360eb1607705859fbbb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c8f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b11bd14605cdcd2e1e8e60ac67a0849d81c70ada69821cfb42fe3156a9d0e470a071ce21d0d6685683c59e355c0acc1e351158d883cdda0360eb1607705859fbbba045f5458f715598bd69ac6b1682455926ea43fe09954dcb901442155e77ed8091b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4fa8203e880a04e3ea02da5f0991dd671dfaef7ccd807c3407558cfedd5d9905a8b2f43244e1d88e2e323bb9366e4a6f8c9f8c7800183015f9094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0a847cf260cfb42a926470ea05554a8f789ee724d36ffa946d1496e49b36618cfa019c6ce68590bcbc531d30bbccf88e8932e3b16825296effbf10eaeaeef697f19c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa847cf260cfb42a926470ea05554a8f789ee724d36ffa946d1496e49b36618cf",
+                        "s" : "0x19c6ce68590bcbc531d30bbccf88e8932e3b16825296effbf10eaeaeef697f19",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x072d14e12201d34f9105be89233178fe35afa4cc2efe277604b6848613b03657",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf4fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d25g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g1v0Filler.json",
+            "sourceHash" : "c48bd492ffc55d826da22f8054929560e8ebc383728da8e7d624c1e581f51951"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba5f",
+                    "hash" : "0xbab26d2d9f7e207de10ce29dd2a3f3e4401801f54c87ed9c1c1d5463bd2da4b9",
+                    "mixHash" : "0x96060402b87c6fca7cd4b61248e9ea048a6f002c6adf49f0f3a7f01368a61c57",
+                    "nonce" : "0xe943d16e60fa8ba0",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7",
+                    "stateRoot" : "0xab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x71ce21d0d6685683c59e355c0acc1e351158d883cdda0360eb1607705859fbbb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c8f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a071ce21d0d6685683c59e355c0acc1e351158d883cdda0360eb1607705859fbbba0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a096060402b87c6fca7cd4b61248e9ea048a6f002c6adf49f0f3a7f01368a61c5788e943d16e60fa8ba0f8c9f8c7800183015f9094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0a847cf260cfb42a926470ea05554a8f789ee724d36ffa946d1496e49b36618cfa019c6ce68590bcbc531d30bbccf88e8932e3b16825296effbf10eaeaeef697f19c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa847cf260cfb42a926470ea05554a8f789ee724d36ffa946d1496e49b36618cf",
+                        "s" : "0x19c6ce68590bcbc531d30bbccf88e8932e3b16825296effbf10eaeaeef697f19",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbab26d2d9f7e207de10ce29dd2a3f3e4401801f54c87ed9c1c1d5463bd2da4b9",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba5f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45a1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d25g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g1v0Filler.json",
+            "sourceHash" : "c48bd492ffc55d826da22f8054929560e8ebc383728da8e7d624c1e581f51951"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba5f",
+                    "hash" : "0x4cd732235ef659fd2c32065e0062a88ba2de3c5043cc9d8466cbc13a0815c699",
+                    "mixHash" : "0x84e539d3c04fbe6f777d1306bd7b872bc385b48330b162ffee1724f8760e08c2",
+                    "nonce" : "0xe251d11e0706454c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7",
+                    "stateRoot" : "0xab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x71ce21d0d6685683c59e355c0acc1e351158d883cdda0360eb1607705859fbbb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c8f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a071ce21d0d6685683c59e355c0acc1e351158d883cdda0360eb1607705859fbbba0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a084e539d3c04fbe6f777d1306bd7b872bc385b48330b162ffee1724f8760e08c288e251d11e0706454cf8c9f8c7800183015f9094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0a847cf260cfb42a926470ea05554a8f789ee724d36ffa946d1496e49b36618cfa019c6ce68590bcbc531d30bbccf88e8932e3b16825296effbf10eaeaeef697f19c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa847cf260cfb42a926470ea05554a8f789ee724d36ffa946d1496e49b36618cf",
+                        "s" : "0x19c6ce68590bcbc531d30bbccf88e8932e3b16825296effbf10eaeaeef697f19",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4cd732235ef659fd2c32065e0062a88ba2de3c5043cc9d8466cbc13a0815c699",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba5f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45a1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g2v0.json
index 7a73a41bf..17b1e8405 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g2v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d25g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g2v0Filler.json",
+            "sourceHash" : "0c40b12ccd37227e9e058e0cdb4755e261c0bc08c42dfffc3e4f4686862a5d1f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4fa",
+                    "hash" : "0x3bc11e594a159a096db0d6e0fd1c2017d5329ee513ac3b262360d77b14314123",
+                    "mixHash" : "0x02a53856cd8e1932cb7a2dfa65cc784b75c242dea4544b8bafec7e20ac0b725a",
+                    "nonce" : "0xf0860bca45ff6709",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x45f5458f715598bd69ac6b1682455926ea43fe09954dcb901442155e77ed8091",
+                    "stateRoot" : "0xb11bd14605cdcd2e1e8e60ac67a0849d81c70ada69821cfb42fe3156a9d0e470",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8f205a651ffdd903b6edea3f36cada3c378e445779072a2c459aea6d54019c85",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c8f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b11bd14605cdcd2e1e8e60ac67a0849d81c70ada69821cfb42fe3156a9d0e470a08f205a651ffdd903b6edea3f36cada3c378e445779072a2c459aea6d54019c85a045f5458f715598bd69ac6b1682455926ea43fe09954dcb901442155e77ed8091b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4fa8203e880a002a53856cd8e1932cb7a2dfa65cc784b75c242dea4544b8bafec7e20ac0b725a88f0860bca45ff6709f8c9f8c780018301adb094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0a5639e12c12bd5177092b95bab67d2a89f62fc513916fa30a6546426a595069aa00a78031e51af0c2d6b76801760f24bc40e0ecd6589d8a74efca3de7ebf687162c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5639e12c12bd5177092b95bab67d2a89f62fc513916fa30a6546426a595069a",
+                        "s" : "0x0a78031e51af0c2d6b76801760f24bc40e0ecd6589d8a74efca3de7ebf687162",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3bc11e594a159a096db0d6e0fd1c2017d5329ee513ac3b262360d77b14314123",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf4fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d25g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g2v0Filler.json",
+            "sourceHash" : "0c40b12ccd37227e9e058e0cdb4755e261c0bc08c42dfffc3e4f4686862a5d1f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba5f",
+                    "hash" : "0x538ddd4ba917ef9c944587183455fb7d009e2b78be79e87eec102e1dfdfc608b",
+                    "mixHash" : "0xcb9cdaeb283b09e0df03e802c0788819ea32f7b805131ebfa23ca6b17543b93d",
+                    "nonce" : "0x26f49e6b6306a578",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7",
+                    "stateRoot" : "0xab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8f205a651ffdd903b6edea3f36cada3c378e445779072a2c459aea6d54019c85",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c8f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a08f205a651ffdd903b6edea3f36cada3c378e445779072a2c459aea6d54019c85a0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a0cb9cdaeb283b09e0df03e802c0788819ea32f7b805131ebfa23ca6b17543b93d8826f49e6b6306a578f8c9f8c780018301adb094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0a5639e12c12bd5177092b95bab67d2a89f62fc513916fa30a6546426a595069aa00a78031e51af0c2d6b76801760f24bc40e0ecd6589d8a74efca3de7ebf687162c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5639e12c12bd5177092b95bab67d2a89f62fc513916fa30a6546426a595069a",
+                        "s" : "0x0a78031e51af0c2d6b76801760f24bc40e0ecd6589d8a74efca3de7ebf687162",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x538ddd4ba917ef9c944587183455fb7d009e2b78be79e87eec102e1dfdfc608b",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba5f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45a1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d25g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g2v0Filler.json",
+            "sourceHash" : "0c40b12ccd37227e9e058e0cdb4755e261c0bc08c42dfffc3e4f4686862a5d1f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba5f",
+                    "hash" : "0x630b5966c6f309f7104b2ae00d7b13538e41228836345af60fb2a4cb9f8e9d7e",
+                    "mixHash" : "0x3d2fcfdeecde4cc4a663a8e0703c88be084eb5e4430aa2d78f18004b2af636be",
+                    "nonce" : "0xc33bebcf14d19519",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7",
+                    "stateRoot" : "0xab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8f205a651ffdd903b6edea3f36cada3c378e445779072a2c459aea6d54019c85",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c8f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a08f205a651ffdd903b6edea3f36cada3c378e445779072a2c459aea6d54019c85a0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a03d2fcfdeecde4cc4a663a8e0703c88be084eb5e4430aa2d78f18004b2af636be88c33bebcf14d19519f8c9f8c780018301adb094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0a5639e12c12bd5177092b95bab67d2a89f62fc513916fa30a6546426a595069aa00a78031e51af0c2d6b76801760f24bc40e0ecd6589d8a74efca3de7ebf687162c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5639e12c12bd5177092b95bab67d2a89f62fc513916fa30a6546426a595069a",
+                        "s" : "0x0a78031e51af0c2d6b76801760f24bc40e0ecd6589d8a74efca3de7ebf687162",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x630b5966c6f309f7104b2ae00d7b13538e41228836345af60fb2a4cb9f8e9d7e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba5f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45a1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g3v0.json
index 7a73a41bf..5f1521d58 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g3v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d25g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g3v0Filler.json",
+            "sourceHash" : "f912c74f83437ec2001779fa632ae8cacc2736a1e2cdc76fc920e836acc2320f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4fa",
+                    "hash" : "0x9b2dbbd5a19489c649688f011704fbac9b4fc22eb4c049d62491af6fdd816f9c",
+                    "mixHash" : "0x0fb61b73498997a685f0f69dde7faaf38510010fd040bc1949fd6a627dbc22cf",
+                    "nonce" : "0x82d7857ccc4f5c7b",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x45f5458f715598bd69ac6b1682455926ea43fe09954dcb901442155e77ed8091",
+                    "stateRoot" : "0xb11bd14605cdcd2e1e8e60ac67a0849d81c70ada69821cfb42fe3156a9d0e470",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6b03328836a9953cdcec325918bb3d258a5543838ea32fbfef2002586f0b2d5e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c8f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b11bd14605cdcd2e1e8e60ac67a0849d81c70ada69821cfb42fe3156a9d0e470a06b03328836a9953cdcec325918bb3d258a5543838ea32fbfef2002586f0b2d5ea045f5458f715598bd69ac6b1682455926ea43fe09954dcb901442155e77ed8091b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4fa8203e880a00fb61b73498997a685f0f69dde7faaf38510010fd040bc1949fd6a627dbc22cf8882d7857ccc4f5c7bf8c9f8c7800183030d4094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ba07db011f87f47852799cd9dc8e39f4944a28d6e55be9743daa8e71f93a6425767a0750e1c0503e60f9077b3f404c424bf21aaca335ce3515a608cf3cc8012e59b6cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7db011f87f47852799cd9dc8e39f4944a28d6e55be9743daa8e71f93a6425767",
+                        "s" : "0x750e1c0503e60f9077b3f404c424bf21aaca335ce3515a608cf3cc8012e59b6c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9b2dbbd5a19489c649688f011704fbac9b4fc22eb4c049d62491af6fdd816f9c",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf4fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d25g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g3v0Filler.json",
+            "sourceHash" : "f912c74f83437ec2001779fa632ae8cacc2736a1e2cdc76fc920e836acc2320f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba5f",
+                    "hash" : "0xf2cd5fbd715b36bc6939c7a79457467f9cd95ae96b8133aba9fbc85be73463d7",
+                    "mixHash" : "0x9d6ac561a4d7e2da00d63173af8ac65f9cebdc5c9541399b69b6580804ec7d48",
+                    "nonce" : "0x43b443369e007d91",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7",
+                    "stateRoot" : "0xab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6b03328836a9953cdcec325918bb3d258a5543838ea32fbfef2002586f0b2d5e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c8f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a06b03328836a9953cdcec325918bb3d258a5543838ea32fbfef2002586f0b2d5ea0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a09d6ac561a4d7e2da00d63173af8ac65f9cebdc5c9541399b69b6580804ec7d488843b443369e007d91f8c9f8c7800183030d4094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ba07db011f87f47852799cd9dc8e39f4944a28d6e55be9743daa8e71f93a6425767a0750e1c0503e60f9077b3f404c424bf21aaca335ce3515a608cf3cc8012e59b6cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7db011f87f47852799cd9dc8e39f4944a28d6e55be9743daa8e71f93a6425767",
+                        "s" : "0x750e1c0503e60f9077b3f404c424bf21aaca335ce3515a608cf3cc8012e59b6c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf2cd5fbd715b36bc6939c7a79457467f9cd95ae96b8133aba9fbc85be73463d7",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba5f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45a1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d25g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g3v0Filler.json",
+            "sourceHash" : "f912c74f83437ec2001779fa632ae8cacc2736a1e2cdc76fc920e836acc2320f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba5f",
+                    "hash" : "0xe66c51674d8ad67665cc2fe77c5b35dd4464e140aa85279fbcbdb729e6bc50cc",
+                    "mixHash" : "0x6858176b50c23979873161636e6313f0ebe5d687465ef14a4f6fc84107996df5",
+                    "nonce" : "0x537c1924b3a90e2e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7",
+                    "stateRoot" : "0xab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6b03328836a9953cdcec325918bb3d258a5543838ea32fbfef2002586f0b2d5e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c8f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a06b03328836a9953cdcec325918bb3d258a5543838ea32fbfef2002586f0b2d5ea0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a06858176b50c23979873161636e6313f0ebe5d687465ef14a4f6fc84107996df588537c1924b3a90e2ef8c9f8c7800183030d4094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ba07db011f87f47852799cd9dc8e39f4944a28d6e55be9743daa8e71f93a6425767a0750e1c0503e60f9077b3f404c424bf21aaca335ce3515a608cf3cc8012e59b6cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7db011f87f47852799cd9dc8e39f4944a28d6e55be9743daa8e71f93a6425767",
+                        "s" : "0x750e1c0503e60f9077b3f404c424bf21aaca335ce3515a608cf3cc8012e59b6c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe66c51674d8ad67665cc2fe77c5b35dd4464e140aa85279fbcbdb729e6bc50cc",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba5f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45a1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g0v0.json
index 2e3f57322..051eda6ac 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d26g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g0v0Filler.json",
             "sourceHash" : "78feb34c2be94b2940451c6b09e6679d76b89e49414c8cf440fae6996d20d913"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf42b",
-                    "hash" : "0x7bad4dac8fe4c89ea40242e39a0edc6e6bb55001c6e4d6fe488042aacc23bfc9",
-                    "mixHash" : "0x118390edf1bac142b6256c4a9e8155f0129691c81da496f84f9b461c02b0d376",
-                    "nonce" : "0x18acd105c77a3239",
+                    "hash" : "0xb7d286ca05a66d550d6ce0b565944b1b00a93de1e0946cca0b8bf814b9d29794",
+                    "mixHash" : "0xb1289ad34b946494535695328eba3184fe894ca22158fb6d178075acff192498",
+                    "nonce" : "0xb904c57deb1a6998",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x6be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xbe0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa065077f9610a756f5c71ad5ac490f87cf51e0c1b365811b732bcabbbc9df6a146a0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea06be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f42b8203e880a0118390edf1bac142b6256c4a9e8155f0129691c81da496f84f9b461c02b0d3768818acd105c77a3239f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa065077f9610a756f5c71ad5ac490f87cf51e0c1b365811b732bcabbbc9df6a146a0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea06be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f42b8203e880a0b1289ad34b946494535695328eba3184fe894ca22158fb6d178075acff19249888b904c57deb1a6998f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bad4dac8fe4c89ea40242e39a0edc6e6bb55001c6e4d6fe488042aacc23bfc9",
+        "lastblockhash" : "0xb7d286ca05a66d550d6ce0b565944b1b00a93de1e0946cca0b8bf814b9d29794",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d26g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g0v0Filler.json",
             "sourceHash" : "78feb34c2be94b2940451c6b09e6679d76b89e49414c8cf440fae6996d20d913"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb993",
-                    "hash" : "0x3677102e387b774c6057d14d26c9a8de2e4330cda64c867b77fd8dc123c6ad4d",
-                    "mixHash" : "0xba70c8ecfbd716169f687a4d2d238d67a840c62ee9735ba7c0e70c4c83bd508d",
-                    "nonce" : "0xc3071355f2d5930d",
+                    "hash" : "0x2261a8597868b3a2d32bbdaf2f0320447bb793576a5b75b929a979d3bec6378e",
+                    "mixHash" : "0xca9d2578cc0875c0243bbed1cb82b6abe349f17a992300b4428ef60e49f74661",
+                    "nonce" : "0x8e40d26830468693",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0xbe0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a0ba70c8ecfbd716169f687a4d2d238d67a840c62ee9735ba7c0e70c4c83bd508d88c3071355f2d5930df8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a0ca9d2578cc0875c0243bbed1cb82b6abe349f17a992300b4428ef60e49f74661888e40d26830468693f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3677102e387b774c6057d14d26c9a8de2e4330cda64c867b77fd8dc123c6ad4d",
+        "lastblockhash" : "0x2261a8597868b3a2d32bbdaf2f0320447bb793576a5b75b929a979d3bec6378e",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d26g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g0v0Filler.json",
             "sourceHash" : "78feb34c2be94b2940451c6b09e6679d76b89e49414c8cf440fae6996d20d913"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb993",
-                    "hash" : "0x1c04913f084c5f2a318276d6991bc4073a25149d44140e67bda1e138187bc460",
-                    "mixHash" : "0x703ee776820b0e3580e23bb78177ec43711a4f12946cc7276aaa28e1f1dddfbf",
-                    "nonce" : "0x185b740fbbb31749",
+                    "hash" : "0x2aae74abdeba61d3b15fab9ac188f5f92bb985dfe3479d624458820bfbba3bb1",
+                    "mixHash" : "0xfc30752f2abc1d38773b789bd42a6e06a16d9f2bab62ce5f1192d2562f49ba47",
+                    "nonce" : "0x55bf6b4197e79e75",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0xbe0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a0703ee776820b0e3580e23bb78177ec43711a4f12946cc7276aaa28e1f1dddfbf88185b740fbbb31749f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a0fc30752f2abc1d38773b789bd42a6e06a16d9f2bab62ce5f1192d2562f49ba478855bf6b4197e79e75f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c04913f084c5f2a318276d6991bc4073a25149d44140e67bda1e138187bc460",
+        "lastblockhash" : "0x2aae74abdeba61d3b15fab9ac188f5f92bb985dfe3479d624458820bfbba3bb1",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g1v0.json
index 7a73a41bf..0559ddcbc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g1v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d26g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g1v0Filler.json",
+            "sourceHash" : "d33a748df5b5fac4fa39813fcddc75f91a85fe992f1fec6dae4d2aed99231123"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf42b",
+                    "hash" : "0xe30813b0e69a28298fd1cb065754df26e8e3d42603f79530cf027b783bd5bd7b",
+                    "mixHash" : "0xe6dc205483024531350c20c96aadc9b2b868bd2aeaca279783a0256f8a212100",
+                    "nonce" : "0xee410f62e6077e75",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x6be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6",
+                    "stateRoot" : "0x65077f9610a756f5c71ad5ac490f87cf51e0c1b365811b732bcabbbc9df6a146",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x327381e0f563e65c3d4f9a94aa2cbe731adea0c711b2985c42ff1648a3deb0c6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa065077f9610a756f5c71ad5ac490f87cf51e0c1b365811b732bcabbbc9df6a146a0327381e0f563e65c3d4f9a94aa2cbe731adea0c711b2985c42ff1648a3deb0c6a06be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f42b8203e880a0e6dc205483024531350c20c96aadc9b2b868bd2aeaca279783a0256f8a21210088ee410f62e6077e75f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba04a3ab4a14bc3d104ed55ce8b9d3ba200523e85834e77d3bdca52a03d2abed455a03a14771a03b5ef70443eba3baff7740fd00bcec5e9346efb5a9eb3dd050a71c2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a3ab4a14bc3d104ed55ce8b9d3ba200523e85834e77d3bdca52a03d2abed455",
+                        "s" : "0x3a14771a03b5ef70443eba3baff7740fd00bcec5e9346efb5a9eb3dd050a71c2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe30813b0e69a28298fd1cb065754df26e8e3d42603f79530cf027b783bd5bd7b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf42b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0bd5",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d26g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g1v0Filler.json",
+            "sourceHash" : "d33a748df5b5fac4fa39813fcddc75f91a85fe992f1fec6dae4d2aed99231123"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0xea35deb8298fc57069b6518a637867a3baf480a1c5d8666a5b679a5e63e26a43",
+                    "mixHash" : "0x9e7f6f7785c13ee466e2cbd977231e47d837df865848d013a844f76ca3eefb33",
+                    "nonce" : "0x69f201ca1c63f164",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x327381e0f563e65c3d4f9a94aa2cbe731adea0c711b2985c42ff1648a3deb0c6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a0327381e0f563e65c3d4f9a94aa2cbe731adea0c711b2985c42ff1648a3deb0c6a0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a09e7f6f7785c13ee466e2cbd977231e47d837df865848d013a844f76ca3eefb338869f201ca1c63f164f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba04a3ab4a14bc3d104ed55ce8b9d3ba200523e85834e77d3bdca52a03d2abed455a03a14771a03b5ef70443eba3baff7740fd00bcec5e9346efb5a9eb3dd050a71c2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a3ab4a14bc3d104ed55ce8b9d3ba200523e85834e77d3bdca52a03d2abed455",
+                        "s" : "0x3a14771a03b5ef70443eba3baff7740fd00bcec5e9346efb5a9eb3dd050a71c2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xea35deb8298fc57069b6518a637867a3baf480a1c5d8666a5b679a5e63e26a43",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b993",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f466d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d26g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g1v0Filler.json",
+            "sourceHash" : "d33a748df5b5fac4fa39813fcddc75f91a85fe992f1fec6dae4d2aed99231123"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0x997969da619e3ca7a91015063e6a3ad95ec99cdc8649517f99fdb3e0e4bcdd2e",
+                    "mixHash" : "0xa36a2ece102b6219f906dc9ca3105346d631379e7d85b8c34464901ecec3735f",
+                    "nonce" : "0xfab7d435f23b8214",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x327381e0f563e65c3d4f9a94aa2cbe731adea0c711b2985c42ff1648a3deb0c6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a0327381e0f563e65c3d4f9a94aa2cbe731adea0c711b2985c42ff1648a3deb0c6a0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a0a36a2ece102b6219f906dc9ca3105346d631379e7d85b8c34464901ecec3735f88fab7d435f23b8214f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba04a3ab4a14bc3d104ed55ce8b9d3ba200523e85834e77d3bdca52a03d2abed455a03a14771a03b5ef70443eba3baff7740fd00bcec5e9346efb5a9eb3dd050a71c2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a3ab4a14bc3d104ed55ce8b9d3ba200523e85834e77d3bdca52a03d2abed455",
+                        "s" : "0x3a14771a03b5ef70443eba3baff7740fd00bcec5e9346efb5a9eb3dd050a71c2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x997969da619e3ca7a91015063e6a3ad95ec99cdc8649517f99fdb3e0e4bcdd2e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b993",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f466d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g2v0.json
index 7a73a41bf..00fcc9b51 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g2v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d26g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g2v0Filler.json",
+            "sourceHash" : "99c3c2155dcea6e5b8c668db0577a71449e3bbad46aff4e632a3088f98827145"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf42b",
+                    "hash" : "0x5e76c306bd2ee1aa929e925b464357728d7a76d4c0727c7a6539118eb7858c4a",
+                    "mixHash" : "0x96cb147baf727c0a7ce649d8c47de379dee4ba3d18563bf44ace7d663ea29558",
+                    "nonce" : "0xd1a760d88eb5885b",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x6be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6",
+                    "stateRoot" : "0x65077f9610a756f5c71ad5ac490f87cf51e0c1b365811b732bcabbbc9df6a146",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4987388fc9556bdd698f5c2de30f4d41c825e1b175f5863990ee52f08ede0d7b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa065077f9610a756f5c71ad5ac490f87cf51e0c1b365811b732bcabbbc9df6a146a04987388fc9556bdd698f5c2de30f4d41c825e1b175f5863990ee52f08ede0d7ba06be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f42b8203e880a096cb147baf727c0a7ce649d8c47de379dee4ba3d18563bf44ace7d663ea2955888d1a760d88eb5885bf8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ca0ae3b2f949c8176a2e2bab19b6192b588da1394429172e6c039950861c99ee455a0548e00ccc019e799e4f5bf3a03638f12d90071edd3996c84ae20d54236d2e13fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae3b2f949c8176a2e2bab19b6192b588da1394429172e6c039950861c99ee455",
+                        "s" : "0x548e00ccc019e799e4f5bf3a03638f12d90071edd3996c84ae20d54236d2e13f",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5e76c306bd2ee1aa929e925b464357728d7a76d4c0727c7a6539118eb7858c4a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf42b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0bd5",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d26g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g2v0Filler.json",
+            "sourceHash" : "99c3c2155dcea6e5b8c668db0577a71449e3bbad46aff4e632a3088f98827145"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0x60f1aa22e9cdb342a1185dc0bb8649c03fa07484f80a60a50e1b6f4aba61ab50",
+                    "mixHash" : "0x8172c9afd545a45db859dbb5b244de4b8239455380499499dca31c2deb272f2f",
+                    "nonce" : "0x3f5d38a0b8c40e01",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4987388fc9556bdd698f5c2de30f4d41c825e1b175f5863990ee52f08ede0d7b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a04987388fc9556bdd698f5c2de30f4d41c825e1b175f5863990ee52f08ede0d7ba0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a08172c9afd545a45db859dbb5b244de4b8239455380499499dca31c2deb272f2f883f5d38a0b8c40e01f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ca0ae3b2f949c8176a2e2bab19b6192b588da1394429172e6c039950861c99ee455a0548e00ccc019e799e4f5bf3a03638f12d90071edd3996c84ae20d54236d2e13fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae3b2f949c8176a2e2bab19b6192b588da1394429172e6c039950861c99ee455",
+                        "s" : "0x548e00ccc019e799e4f5bf3a03638f12d90071edd3996c84ae20d54236d2e13f",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x60f1aa22e9cdb342a1185dc0bb8649c03fa07484f80a60a50e1b6f4aba61ab50",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b993",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f466d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d26g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g2v0Filler.json",
+            "sourceHash" : "99c3c2155dcea6e5b8c668db0577a71449e3bbad46aff4e632a3088f98827145"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0xf173e9d82cc86c54108af7e600657d28d98e9a717fdba5d28c628196b9d91478",
+                    "mixHash" : "0xcf78892e4ef11f637acef3fa60fddeaeb526e7be250ad3ec012c9910b9a46a13",
+                    "nonce" : "0x7e92328d1be92dd0",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4987388fc9556bdd698f5c2de30f4d41c825e1b175f5863990ee52f08ede0d7b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a04987388fc9556bdd698f5c2de30f4d41c825e1b175f5863990ee52f08ede0d7ba0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a0cf78892e4ef11f637acef3fa60fddeaeb526e7be250ad3ec012c9910b9a46a13887e92328d1be92dd0f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ca0ae3b2f949c8176a2e2bab19b6192b588da1394429172e6c039950861c99ee455a0548e00ccc019e799e4f5bf3a03638f12d90071edd3996c84ae20d54236d2e13fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae3b2f949c8176a2e2bab19b6192b588da1394429172e6c039950861c99ee455",
+                        "s" : "0x548e00ccc019e799e4f5bf3a03638f12d90071edd3996c84ae20d54236d2e13f",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf173e9d82cc86c54108af7e600657d28d98e9a717fdba5d28c628196b9d91478",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b993",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f466d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g3v0.json
index 7a73a41bf..2582cff32 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g3v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d26g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g3v0Filler.json",
+            "sourceHash" : "a03007a305f863c44fac6e215951e8bd842a596fa33cadf967ad2b6c15dec459"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf42b",
+                    "hash" : "0x3a8d020366eb6cd9e7a107698c39030b8dc213c40dd5b744eb250dee0cfa74f8",
+                    "mixHash" : "0x0df7fba64bad510733344ebdec110aba4061287e37a49b771126de36d1270265",
+                    "nonce" : "0x0bf2e4869ac045a1",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x6be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6",
+                    "stateRoot" : "0x65077f9610a756f5c71ad5ac490f87cf51e0c1b365811b732bcabbbc9df6a146",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8ec6b2ccfc50101109870858bae1cb0f469e8e768e9c53759649ca102af52072",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa065077f9610a756f5c71ad5ac490f87cf51e0c1b365811b732bcabbbc9df6a146a08ec6b2ccfc50101109870858bae1cb0f469e8e768e9c53759649ca102af52072a06be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f42b8203e880a00df7fba64bad510733344ebdec110aba4061287e37a49b771126de36d1270265880bf2e4869ac045a1f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0d65ac2dad3436fbe93340022cb4d26b98a3e097ed99963b75c324e72cb9d7480a044f6007f170f2e516533977cc51dfdaae16809208c731dda2fd3efa9295ba476c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd65ac2dad3436fbe93340022cb4d26b98a3e097ed99963b75c324e72cb9d7480",
+                        "s" : "0x44f6007f170f2e516533977cc51dfdaae16809208c731dda2fd3efa9295ba476",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3a8d020366eb6cd9e7a107698c39030b8dc213c40dd5b744eb250dee0cfa74f8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf42b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0bd5",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d26g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g3v0Filler.json",
+            "sourceHash" : "a03007a305f863c44fac6e215951e8bd842a596fa33cadf967ad2b6c15dec459"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0x9ad6647e7e2e8493419c56012fe032ea0e988b42c8b564c1e8af350ce4a6446b",
+                    "mixHash" : "0x9de25a1c5fc45f857fa3405c548cda93dc984d81200336d9df45d7d94d3d4c9f",
+                    "nonce" : "0x9313eec007189232",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8ec6b2ccfc50101109870858bae1cb0f469e8e768e9c53759649ca102af52072",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a08ec6b2ccfc50101109870858bae1cb0f469e8e768e9c53759649ca102af52072a0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a09de25a1c5fc45f857fa3405c548cda93dc984d81200336d9df45d7d94d3d4c9f889313eec007189232f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0d65ac2dad3436fbe93340022cb4d26b98a3e097ed99963b75c324e72cb9d7480a044f6007f170f2e516533977cc51dfdaae16809208c731dda2fd3efa9295ba476c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd65ac2dad3436fbe93340022cb4d26b98a3e097ed99963b75c324e72cb9d7480",
+                        "s" : "0x44f6007f170f2e516533977cc51dfdaae16809208c731dda2fd3efa9295ba476",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9ad6647e7e2e8493419c56012fe032ea0e988b42c8b564c1e8af350ce4a6446b",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b993",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f466d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d26g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g3v0Filler.json",
+            "sourceHash" : "a03007a305f863c44fac6e215951e8bd842a596fa33cadf967ad2b6c15dec459"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0x9d5f3876d41e8dd84a6bf26ca255f5e4d6d00c6174a316a1342c0223c2f28fbe",
+                    "mixHash" : "0xdf2346e6723663d5598108b3d2527f229f882a7f70e9f9f0480a6e1c1a4e9407",
+                    "nonce" : "0x15676f4955746a28",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8ec6b2ccfc50101109870858bae1cb0f469e8e768e9c53759649ca102af52072",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a08ec6b2ccfc50101109870858bae1cb0f469e8e768e9c53759649ca102af52072a0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a0df2346e6723663d5598108b3d2527f229f882a7f70e9f9f0480a6e1c1a4e94078815676f4955746a28f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0d65ac2dad3436fbe93340022cb4d26b98a3e097ed99963b75c324e72cb9d7480a044f6007f170f2e516533977cc51dfdaae16809208c731dda2fd3efa9295ba476c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd65ac2dad3436fbe93340022cb4d26b98a3e097ed99963b75c324e72cb9d7480",
+                        "s" : "0x44f6007f170f2e516533977cc51dfdaae16809208c731dda2fd3efa9295ba476",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9d5f3876d41e8dd84a6bf26ca255f5e4d6d00c6174a316a1342c0223c2f28fbe",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b993",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f466d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g0v0.json
index 83e96d78e..289513c45 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d27g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g0v0Filler.json",
             "sourceHash" : "8e3a6a3b0ea8d813a0a722cf4e7695d3e6dca5ea39f0f064ddd29f9abfe6f81f"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xfa6f",
-                    "hash" : "0x51a05185969f98d7d7f7cc7d2200ff10f856870ee2c1d3d7e2a632411188d71c",
-                    "mixHash" : "0x4f586529f4d64c705ba33a9ea16074753b3bd79f6a9b1b9aa5f69f8aa2e8def2",
-                    "nonce" : "0x59b2f5a404171151",
+                    "hash" : "0x49e9581ff6b153c90fafa447402d49bba1c0c4b294c98f0ba068c06aa064e5a0",
+                    "mixHash" : "0x0e4b7a01788845dfe1945603e77d0f363b9b744cdb687f8f47c2f0db7be04414",
+                    "nonce" : "0x585d09e905961585",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xe0d79da65e3950bb5e58dc58384933a3b8ba94c6cea987eead12239bd2caf1ba",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x0fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf903caf901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020cbdb326e7af03762393a134b4df833fbee0c2de71e624f2a648a4a3db21d33a00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a0e0d79da65e3950bb5e58dc58384933a3b8ba94c6cea987eead12239bd2caf1bab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fa6f8203e880a04f586529f4d64c705ba33a9ea16074753b3bd79f6a9b1b9aa5f69f8aa2e8def28859b2f5a404171151f901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
+                "rlp" : "0xf903caf901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020cbdb326e7af03762393a134b4df833fbee0c2de71e624f2a648a4a3db21d33a00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a0e0d79da65e3950bb5e58dc58384933a3b8ba94c6cea987eead12239bd2caf1bab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fa6f8203e880a00e4b7a01788845dfe1945603e77d0f363b9b744cdb687f8f47c2f0db7be0441488585d09e905961585f901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51a05185969f98d7d7f7cc7d2200ff10f856870ee2c1d3d7e2a632411188d71c",
+        "lastblockhash" : "0x49e9581ff6b153c90fafa447402d49bba1c0c4b294c98f0ba068c06aa064e5a0",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d27g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g0v0Filler.json",
             "sourceHash" : "8e3a6a3b0ea8d813a0a722cf4e7695d3e6dca5ea39f0f064ddd29f9abfe6f81f"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xbe6f",
-                    "hash" : "0x924725745ab0754c8318371324042e7d7ba7844b5e0eedb508067cc364e1dfb0",
-                    "mixHash" : "0x87815d21c3109a7bc6a35f2c760ef6b5880cef9056eda438a8ee5aef66ab03bc",
-                    "nonce" : "0xdea2e3ddfae678af",
+                    "hash" : "0x3d6b1adc48ec723f37dd38af43c406df4b5e1a6088c54678381cf5ae2c12633c",
+                    "mixHash" : "0x33c5e26c8605811c76faf5218111526cbf8a3e3cf83513b2037e8e72f7d50fac",
+                    "nonce" : "0xa823d7082b0e7317",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xaf7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0x0fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf903caf901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a087815d21c3109a7bc6a35f2c760ef6b5880cef9056eda438a8ee5aef66ab03bc88dea2e3ddfae678aff901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
+                "rlp" : "0xf903caf901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a033c5e26c8605811c76faf5218111526cbf8a3e3cf83513b2037e8e72f7d50fac88a823d7082b0e7317f901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x924725745ab0754c8318371324042e7d7ba7844b5e0eedb508067cc364e1dfb0",
+        "lastblockhash" : "0x3d6b1adc48ec723f37dd38af43c406df4b5e1a6088c54678381cf5ae2c12633c",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d27g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g0v0Filler.json",
             "sourceHash" : "8e3a6a3b0ea8d813a0a722cf4e7695d3e6dca5ea39f0f064ddd29f9abfe6f81f"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xbe6f",
-                    "hash" : "0x91a6123cd165700f6ecc20ef3cf34a01f065e0faa4dbf47f6117a25faec1f393",
-                    "mixHash" : "0x633abf294dd6897f529baa5ad3a7b0164e1e9840d5edd9bec61321fd6ad8e44b",
-                    "nonce" : "0x1cfc158e7e69948b",
+                    "hash" : "0xba87b3cc57357aba0ead468081762ddd34157119a13723d4a34fb8a75fecac08",
+                    "mixHash" : "0x50ab941ed07f708f8331246bd1da9704315b683134af96b37d3c20ae6c6f0348",
+                    "nonce" : "0xd82a7a75e2967ef2",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xaf7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0x0fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf903caf901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a0633abf294dd6897f529baa5ad3a7b0164e1e9840d5edd9bec61321fd6ad8e44b881cfc158e7e69948bf901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
+                "rlp" : "0xf903caf901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a050ab941ed07f708f8331246bd1da9704315b683134af96b37d3c20ae6c6f034888d82a7a75e2967ef2f901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x91a6123cd165700f6ecc20ef3cf34a01f065e0faa4dbf47f6117a25faec1f393",
+        "lastblockhash" : "0xba87b3cc57357aba0ead468081762ddd34157119a13723d4a34fb8a75fecac08",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g1v0.json
index 7a73a41bf..52aa1c9e6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g1v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d27g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g1v0Filler.json",
+            "sourceHash" : "a085cb49e4719fe116ce0f77b9a3997a53050357633023abf84a0b06c9246725"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xfa6f",
+                    "hash" : "0x6191128acf8d1931a531e6ae08be39be68a6b49b320722bb5a55fd5ab96106a6",
+                    "mixHash" : "0x486d2dc2492bdb4e9f69e9c49dcba1cfe50ff8098c6e9320398ee4070f295cb5",
+                    "nonce" : "0xd68cd3e361525ac4",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xe0d79da65e3950bb5e58dc58384933a3b8ba94c6cea987eead12239bd2caf1ba",
+                    "stateRoot" : "0x20cbdb326e7af03762393a134b4df833fbee0c2de71e624f2a648a4a3db21d33",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf5c60fb9e2d024760f9232474af3656c2d335af4577b5b86f8700300d3d0431b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf903c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020cbdb326e7af03762393a134b4df833fbee0c2de71e624f2a648a4a3db21d33a0f5c60fb9e2d024760f9232474af3656c2d335af4577b5b86f8700300d3d0431ba0e0d79da65e3950bb5e58dc58384933a3b8ba94c6cea987eead12239bd2caf1bab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fa6f8203e880a0486d2dc2492bdb4e9f69e9c49dcba1cfe50ff8098c6e9320398ee4070f295cb588d68cd3e361525ac4f901c9f901c6800183015f9094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ca050f9c5297c95ffdc6da62c6c990503a312a42944ab4406685d498dddef2c212fa01c9dd70fee611800f71d199d9ad76188c1a2f6e4877be4925f81576b81ba4f63c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50f9c5297c95ffdc6da62c6c990503a312a42944ab4406685d498dddef2c212f",
+                        "s" : "0x1c9dd70fee611800f71d199d9ad76188c1a2f6e4877be4925f81576b81ba4f63",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6191128acf8d1931a531e6ae08be39be68a6b49b320722bb5a55fd5ab96106a6",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cfa6f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0591",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d27g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g1v0Filler.json",
+            "sourceHash" : "a085cb49e4719fe116ce0f77b9a3997a53050357633023abf84a0b06c9246725"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbe6f",
+                    "hash" : "0xdb1852015c3615c710137c51083e0899f176c356e00419df41af9f6e41dd8816",
+                    "mixHash" : "0xa65e6e111e03c3b50ab2aca0758fad51d3988bb76775ffa9d997e2cd4b46052c",
+                    "nonce" : "0x38fcb280540faf42",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xaf7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177",
+                    "stateRoot" : "0x32dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf5c60fb9e2d024760f9232474af3656c2d335af4577b5b86f8700300d3d0431b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf903c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca0f5c60fb9e2d024760f9232474af3656c2d335af4577b5b86f8700300d3d0431ba0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a0a65e6e111e03c3b50ab2aca0758fad51d3988bb76775ffa9d997e2cd4b46052c8838fcb280540faf42f901c9f901c6800183015f9094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ca050f9c5297c95ffdc6da62c6c990503a312a42944ab4406685d498dddef2c212fa01c9dd70fee611800f71d199d9ad76188c1a2f6e4877be4925f81576b81ba4f63c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50f9c5297c95ffdc6da62c6c990503a312a42944ab4406685d498dddef2c212f",
+                        "s" : "0x1c9dd70fee611800f71d199d9ad76188c1a2f6e4877be4925f81576b81ba4f63",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdb1852015c3615c710137c51083e0899f176c356e00419df41af9f6e41dd8816",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4be6f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4191",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d27g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g1v0Filler.json",
+            "sourceHash" : "a085cb49e4719fe116ce0f77b9a3997a53050357633023abf84a0b06c9246725"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbe6f",
+                    "hash" : "0x2a92f97408cf9dd6021626cebf92622c6aef7d41a1418fae40aea6a931f84472",
+                    "mixHash" : "0x48c457eb228e83b78d8197295f10dfd005d3d3a40e9262e103d7a371519b3bb6",
+                    "nonce" : "0x71e69609f26eb5f2",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xaf7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177",
+                    "stateRoot" : "0x32dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf5c60fb9e2d024760f9232474af3656c2d335af4577b5b86f8700300d3d0431b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf903c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca0f5c60fb9e2d024760f9232474af3656c2d335af4577b5b86f8700300d3d0431ba0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a048c457eb228e83b78d8197295f10dfd005d3d3a40e9262e103d7a371519b3bb68871e69609f26eb5f2f901c9f901c6800183015f9094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ca050f9c5297c95ffdc6da62c6c990503a312a42944ab4406685d498dddef2c212fa01c9dd70fee611800f71d199d9ad76188c1a2f6e4877be4925f81576b81ba4f63c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50f9c5297c95ffdc6da62c6c990503a312a42944ab4406685d498dddef2c212f",
+                        "s" : "0x1c9dd70fee611800f71d199d9ad76188c1a2f6e4877be4925f81576b81ba4f63",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2a92f97408cf9dd6021626cebf92622c6aef7d41a1418fae40aea6a931f84472",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4be6f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4191",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g2v0.json
index 7a73a41bf..5cf188c9f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g2v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d27g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g2v0Filler.json",
+            "sourceHash" : "4e760227afeafb76bed55df225f3ddb2acf7ee57c9be03ab5ceabbfc8703d3a2"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xfa6f",
+                    "hash" : "0x6ff99c15452c595683f069aea73d213dcb98c7f57b3fd0b6d9588d31f960b988",
+                    "mixHash" : "0x65079ecd9b49db2cacbbfe564ee409771c113e9db72ed06052af851382a8d1d1",
+                    "nonce" : "0x32a0a17bae534dfb",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xe0d79da65e3950bb5e58dc58384933a3b8ba94c6cea987eead12239bd2caf1ba",
+                    "stateRoot" : "0x20cbdb326e7af03762393a134b4df833fbee0c2de71e624f2a648a4a3db21d33",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x906613f94f7f641be5ee5be5d540d53a189fb049a2eb8fedbd02c03a6491ce0d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf903c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020cbdb326e7af03762393a134b4df833fbee0c2de71e624f2a648a4a3db21d33a0906613f94f7f641be5ee5be5d540d53a189fb049a2eb8fedbd02c03a6491ce0da0e0d79da65e3950bb5e58dc58384933a3b8ba94c6cea987eead12239bd2caf1bab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fa6f8203e880a065079ecd9b49db2cacbbfe564ee409771c113e9db72ed06052af851382a8d1d18832a0a17bae534dfbf901c9f901c680018301adb094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba00e627299d5a32a379af0efd82ce9e27484fe8b7db7a85e99ea1abacfb57407a9a01fa2591e8e14e374be40162eb6bbd740229ae9c230f5b01f5416a8a331f3c15ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e627299d5a32a379af0efd82ce9e27484fe8b7db7a85e99ea1abacfb57407a9",
+                        "s" : "0x1fa2591e8e14e374be40162eb6bbd740229ae9c230f5b01f5416a8a331f3c15e",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6ff99c15452c595683f069aea73d213dcb98c7f57b3fd0b6d9588d31f960b988",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cfa6f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0591",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d27g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g2v0Filler.json",
+            "sourceHash" : "4e760227afeafb76bed55df225f3ddb2acf7ee57c9be03ab5ceabbfc8703d3a2"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbe6f",
+                    "hash" : "0x5069239f646cb0d09812ecbdd9927c8a87978b6ef2a3e3837a97ce440c8ee341",
+                    "mixHash" : "0xe87fe1a53283e31eff8610a69789059952756b30d3e676118a7afe6c457a3653",
+                    "nonce" : "0x230b2b3cffb38d7b",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xaf7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177",
+                    "stateRoot" : "0x32dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x906613f94f7f641be5ee5be5d540d53a189fb049a2eb8fedbd02c03a6491ce0d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf903c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca0906613f94f7f641be5ee5be5d540d53a189fb049a2eb8fedbd02c03a6491ce0da0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a0e87fe1a53283e31eff8610a69789059952756b30d3e676118a7afe6c457a365388230b2b3cffb38d7bf901c9f901c680018301adb094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba00e627299d5a32a379af0efd82ce9e27484fe8b7db7a85e99ea1abacfb57407a9a01fa2591e8e14e374be40162eb6bbd740229ae9c230f5b01f5416a8a331f3c15ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e627299d5a32a379af0efd82ce9e27484fe8b7db7a85e99ea1abacfb57407a9",
+                        "s" : "0x1fa2591e8e14e374be40162eb6bbd740229ae9c230f5b01f5416a8a331f3c15e",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5069239f646cb0d09812ecbdd9927c8a87978b6ef2a3e3837a97ce440c8ee341",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4be6f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4191",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d27g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g2v0Filler.json",
+            "sourceHash" : "4e760227afeafb76bed55df225f3ddb2acf7ee57c9be03ab5ceabbfc8703d3a2"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbe6f",
+                    "hash" : "0x5042160f6b8b47efe605e6b2a9c984b043d7149e9c08083d96abfdd5d27adcd6",
+                    "mixHash" : "0xa6c69bdc31ccfbc8d8424a3a5c0b278d9d6d176cf004c5d8a05a5cab7b6ced58",
+                    "nonce" : "0xcb96f62d076e5d24",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xaf7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177",
+                    "stateRoot" : "0x32dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x906613f94f7f641be5ee5be5d540d53a189fb049a2eb8fedbd02c03a6491ce0d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf903c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca0906613f94f7f641be5ee5be5d540d53a189fb049a2eb8fedbd02c03a6491ce0da0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a0a6c69bdc31ccfbc8d8424a3a5c0b278d9d6d176cf004c5d8a05a5cab7b6ced5888cb96f62d076e5d24f901c9f901c680018301adb094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba00e627299d5a32a379af0efd82ce9e27484fe8b7db7a85e99ea1abacfb57407a9a01fa2591e8e14e374be40162eb6bbd740229ae9c230f5b01f5416a8a331f3c15ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e627299d5a32a379af0efd82ce9e27484fe8b7db7a85e99ea1abacfb57407a9",
+                        "s" : "0x1fa2591e8e14e374be40162eb6bbd740229ae9c230f5b01f5416a8a331f3c15e",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5042160f6b8b47efe605e6b2a9c984b043d7149e9c08083d96abfdd5d27adcd6",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4be6f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4191",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g3v0.json
index 7a73a41bf..72118da51 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g3v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d27g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g3v0Filler.json",
+            "sourceHash" : "86b9f5cceb1a0b055bb1caccad3a9e7a860547b7c83cd0900a64a666734215fc"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xfa6f",
+                    "hash" : "0x00aafaec81fbf6f52ad8733b3319bd956372322bf03767c706bace06a33bb4b2",
+                    "mixHash" : "0x92b6baa6c976be3a0b1f2ed2b45e4d46f7ba61636df8b4bd9a45246c12b5373d",
+                    "nonce" : "0x23376dc756a30edb",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xe0d79da65e3950bb5e58dc58384933a3b8ba94c6cea987eead12239bd2caf1ba",
+                    "stateRoot" : "0x20cbdb326e7af03762393a134b4df833fbee0c2de71e624f2a648a4a3db21d33",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5a166450f49dd1c58ad0b37da4eb1ad6737bfc69d93c09c1a31cbdf5a027605f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf903c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020cbdb326e7af03762393a134b4df833fbee0c2de71e624f2a648a4a3db21d33a05a166450f49dd1c58ad0b37da4eb1ad6737bfc69d93c09c1a31cbdf5a027605fa0e0d79da65e3950bb5e58dc58384933a3b8ba94c6cea987eead12239bd2caf1bab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fa6f8203e880a092b6baa6c976be3a0b1f2ed2b45e4d46f7ba61636df8b4bd9a45246c12b5373d8823376dc756a30edbf901c9f901c6800183030d4094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba02585fede0082472b966fd23899ba07a3cdbaabd105dac63ecfd4601f3d6accefa0020b50a4b60f1050716ce68429b47a258fe4f1549486a3aeba949cd362df6e9dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2585fede0082472b966fd23899ba07a3cdbaabd105dac63ecfd4601f3d6accef",
+                        "s" : "0x020b50a4b60f1050716ce68429b47a258fe4f1549486a3aeba949cd362df6e9d",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x00aafaec81fbf6f52ad8733b3319bd956372322bf03767c706bace06a33bb4b2",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cfa6f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0591",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d27g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g3v0Filler.json",
+            "sourceHash" : "86b9f5cceb1a0b055bb1caccad3a9e7a860547b7c83cd0900a64a666734215fc"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbe6f",
+                    "hash" : "0xcdb7505424ce64859d9e6210e0803868ed63affce8bf997d4a6afa4c60da2e73",
+                    "mixHash" : "0x1b605c90621cd15b6d74bbc708b32f4406017f4ff0e703156d42306b1bc15046",
+                    "nonce" : "0x6cde70c8b247950a",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xaf7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177",
+                    "stateRoot" : "0x32dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5a166450f49dd1c58ad0b37da4eb1ad6737bfc69d93c09c1a31cbdf5a027605f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf903c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca05a166450f49dd1c58ad0b37da4eb1ad6737bfc69d93c09c1a31cbdf5a027605fa0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a01b605c90621cd15b6d74bbc708b32f4406017f4ff0e703156d42306b1bc15046886cde70c8b247950af901c9f901c6800183030d4094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba02585fede0082472b966fd23899ba07a3cdbaabd105dac63ecfd4601f3d6accefa0020b50a4b60f1050716ce68429b47a258fe4f1549486a3aeba949cd362df6e9dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2585fede0082472b966fd23899ba07a3cdbaabd105dac63ecfd4601f3d6accef",
+                        "s" : "0x020b50a4b60f1050716ce68429b47a258fe4f1549486a3aeba949cd362df6e9d",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcdb7505424ce64859d9e6210e0803868ed63affce8bf997d4a6afa4c60da2e73",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4be6f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4191",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d27g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g3v0Filler.json",
+            "sourceHash" : "86b9f5cceb1a0b055bb1caccad3a9e7a860547b7c83cd0900a64a666734215fc"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbe6f",
+                    "hash" : "0xeb88c1fb36a80d8a3328f17ff45b518351e1614fc34553d4bc53886938f7c081",
+                    "mixHash" : "0x6524bd3ed642ed7b32925c8aa72d3ee47110d23fedf95169bcddd8e1ac35b4aa",
+                    "nonce" : "0x18c08050327fc0c0",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xaf7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177",
+                    "stateRoot" : "0x32dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5a166450f49dd1c58ad0b37da4eb1ad6737bfc69d93c09c1a31cbdf5a027605f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf903c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca05a166450f49dd1c58ad0b37da4eb1ad6737bfc69d93c09c1a31cbdf5a027605fa0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a06524bd3ed642ed7b32925c8aa72d3ee47110d23fedf95169bcddd8e1ac35b4aa8818c08050327fc0c0f901c9f901c6800183030d4094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba02585fede0082472b966fd23899ba07a3cdbaabd105dac63ecfd4601f3d6accefa0020b50a4b60f1050716ce68429b47a258fe4f1549486a3aeba949cd362df6e9dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2585fede0082472b966fd23899ba07a3cdbaabd105dac63ecfd4601f3d6accef",
+                        "s" : "0x020b50a4b60f1050716ce68429b47a258fe4f1549486a3aeba949cd362df6e9d",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xeb88c1fb36a80d8a3328f17ff45b518351e1614fc34553d4bc53886938f7c081",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4be6f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4191",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g0v0.json
index ae7925ea6..78a995064 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d28g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g0v0Filler.json",
             "sourceHash" : "53f6510bec7dc5597bc7eb357e8347161c279e18f3fdbfcaff6f0bc2512356b8"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05de31f3",
-                    "hash" : "0x2f30128febf4825b3e997e0ebd89970d39ca0fb8ff95593214f011234365c907",
-                    "mixHash" : "0xa8bb8d6b4debb6d92ea4dff34feef1985764df82c36c94ca62d6b031f5ff2c62",
-                    "nonce" : "0xc9398dd503f61493",
+                    "hash" : "0xbde14493219fddb04ee1d7a3a92174fa3c5b18d872155c1581e230382a93b09c",
+                    "mixHash" : "0x603b5508fa9fedce72daff150781320178f67a162dad072b07cca269c9cd7315",
+                    "nonce" : "0x38b41f3b01f3f2a3",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xd9f286331f4a6a3c498998c6cb32d7f1c34c9a51738a017b620b1d90efbbb21f",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xa631af4e3d013ac66d7e0986dfd177851288bb9ebffc04de7cf6be69df041b9e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bcfd1af0499a114f8284b8f01a479097c5065ecfa62fc6816def9a4b287c67a5a0a631af4e3d013ac66d7e0986dfd177851288bb9ebffc04de7cf6be69df041b9ea0d9f286331f4a6a3c498998c6cb32d7f1c34c9a51738a017b620b1d90efbbb21fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405de31f38203e880a0a8bb8d6b4debb6d92ea4dff34feef1985764df82c36c94ca62d6b031f5ff2c6288c9398dd503f61493f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ca016b766473e84c65ae996b4ef6e39b9d96f7d53bb045aa528b41b1c863017bd46a07872b8f1f29c14cbbcdc2722aef84721338f041802e88d8354f023f70f4b908fc0",
+                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bcfd1af0499a114f8284b8f01a479097c5065ecfa62fc6816def9a4b287c67a5a0a631af4e3d013ac66d7e0986dfd177851288bb9ebffc04de7cf6be69df041b9ea0d9f286331f4a6a3c498998c6cb32d7f1c34c9a51738a017b620b1d90efbbb21fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405de31f38203e880a0603b5508fa9fedce72daff150781320178f67a162dad072b07cca269c9cd73158838b41f3b01f3f2a3f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ca016b766473e84c65ae996b4ef6e39b9d96f7d53bb045aa528b41b1c863017bd46a07872b8f1f29c14cbbcdc2722aef84721338f041802e88d8354f023f70f4b908fc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f30128febf4825b3e997e0ebd89970d39ca0fb8ff95593214f011234365c907",
+        "lastblockhash" : "0xbde14493219fddb04ee1d7a3a92174fa3c5b18d872155c1581e230382a93b09c",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -109,8 +109,8 @@
     "modexp_d28g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g0v0Filler.json",
             "sourceHash" : "53f6510bec7dc5597bc7eb357e8347161c279e18f3fdbfcaff6f0bc2512356b8"
         },
@@ -123,9 +123,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb841",
-                    "hash" : "0x970240d5cefdddf2d226471e5e274edb9132ddb92534b602ac872bf53716de1c",
-                    "mixHash" : "0x5276e719f760352517b298398107299c8aafa07ee6b2a4994fd5d9b0b00c2adc",
-                    "nonce" : "0x5d591496b7498d0f",
+                    "hash" : "0xe9b74b687ce9811cf93c19f860ca0bf5c144f0d6bc85445a61c3b07944689a65",
+                    "mixHash" : "0x72aad5fc5debf49d5958674a30e3f808ea30b5787f669ddd07749dfcd6af286c",
+                    "nonce" : "0x90801487225dd115",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
@@ -134,7 +134,7 @@
                     "transactionsTrie" : "0xa631af4e3d013ac66d7e0986dfd177851288bb9ebffc04de7cf6be69df041b9e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa0a631af4e3d013ac66d7e0986dfd177851288bb9ebffc04de7cf6be69df041b9ea03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a05276e719f760352517b298398107299c8aafa07ee6b2a4994fd5d9b0b00c2adc885d591496b7498d0ff8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ca016b766473e84c65ae996b4ef6e39b9d96f7d53bb045aa528b41b1c863017bd46a07872b8f1f29c14cbbcdc2722aef84721338f041802e88d8354f023f70f4b908fc0",
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa0a631af4e3d013ac66d7e0986dfd177851288bb9ebffc04de7cf6be69df041b9ea03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a072aad5fc5debf49d5958674a30e3f808ea30b5787f669ddd07749dfcd6af286c8890801487225dd115f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ca016b766473e84c65ae996b4ef6e39b9d96f7d53bb045aa528b41b1c863017bd46a07872b8f1f29c14cbbcdc2722aef84721338f041802e88d8354f023f70f4b908fc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -171,7 +171,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x970240d5cefdddf2d226471e5e274edb9132ddb92534b602ac872bf53716de1c",
+        "lastblockhash" : "0xe9b74b687ce9811cf93c19f860ca0bf5c144f0d6bc85445a61c3b07944689a65",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -217,8 +217,8 @@
     "modexp_d28g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g0v0Filler.json",
             "sourceHash" : "53f6510bec7dc5597bc7eb357e8347161c279e18f3fdbfcaff6f0bc2512356b8"
         },
@@ -231,9 +231,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb841",
-                    "hash" : "0xffb164dab65384d2d1c9012ad3ffc4ed349d1c4bfe1ecc89c3a481a1fe854f90",
-                    "mixHash" : "0x08fe88c2f34b878bd0896c46feecb991489888b648b293a254bb4223e32d7764",
-                    "nonce" : "0x9fd2e774f4e636ae",
+                    "hash" : "0x9fd69ec105fee2c5a1abd27cd1646589fa20ab9ae0ea7bf1a58e31277d3a1b9d",
+                    "mixHash" : "0xf3928990bf394c8da67691f5463939a5ec45aabcc6e99a1da180675b65266ed4",
+                    "nonce" : "0x616060bbe1841eda",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
@@ -242,7 +242,7 @@
                     "transactionsTrie" : "0xa631af4e3d013ac66d7e0986dfd177851288bb9ebffc04de7cf6be69df041b9e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa0a631af4e3d013ac66d7e0986dfd177851288bb9ebffc04de7cf6be69df041b9ea03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a008fe88c2f34b878bd0896c46feecb991489888b648b293a254bb4223e32d7764889fd2e774f4e636aef8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ca016b766473e84c65ae996b4ef6e39b9d96f7d53bb045aa528b41b1c863017bd46a07872b8f1f29c14cbbcdc2722aef84721338f041802e88d8354f023f70f4b908fc0",
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa0a631af4e3d013ac66d7e0986dfd177851288bb9ebffc04de7cf6be69df041b9ea03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0f3928990bf394c8da67691f5463939a5ec45aabcc6e99a1da180675b65266ed488616060bbe1841edaf8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ca016b766473e84c65ae996b4ef6e39b9d96f7d53bb045aa528b41b1c863017bd46a07872b8f1f29c14cbbcdc2722aef84721338f041802e88d8354f023f70f4b908fc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -279,7 +279,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xffb164dab65384d2d1c9012ad3ffc4ed349d1c4bfe1ecc89c3a481a1fe854f90",
+        "lastblockhash" : "0x9fd69ec105fee2c5a1abd27cd1646589fa20ab9ae0ea7bf1a58e31277d3a1b9d",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g1v0.json
index 7a73a41bf..acf6df421 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g1v0.json
@@ -1,2 +1,325 @@
 {
+    "modexp_d28g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g1v0Filler.json",
+            "sourceHash" : "8eef1929335d9bac8d5c05ef301c926571d6682472044a8da5672a9718114db8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x458224096cdd93df78aba782257194f476da2515e69ba24b4574553c56e4b22f",
+                    "mixHash" : "0xa6a47abc36f932a8e5fe8908a83ed1556ac06423b390d6c3c5eaab42a39d7d4c",
+                    "nonce" : "0x75dfe5e1f0837e48",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0x7bb1bf5b51553025d5f5008c52d39d7e3ed480b625862bc3b70d403ec7492e82",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc89d9f825601f3e3d3e33a5d4da3096399d87f9323e4869f42d6894d2660ff52",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a3f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bb1bf5b51553025d5f5008c52d39d7e3ed480b625862bc3b70d403ec7492e82a0c89d9f825601f3e3d3e33a5d4da3096399d87f9323e4869f42d6894d2660ff52a022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083015f908203e880a0a6a47abc36f932a8e5fe8908a83ed1556ac06423b390d6c3c5eaab42a39d7d4c8875dfe5e1f0837e48f8a3f8a1800183015f9094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ca08a7156a20980bf7aa66c2b6258ea93c7164e7468c16cfa91fa64c7517459e89aa0416ef5541351ca8a857b5459a7aad87a6e8829458b454e17c61d02f1eb3e889cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a7156a20980bf7aa66c2b6258ea93c7164e7468c16cfa91fa64c7517459e89a",
+                        "s" : "0x416ef5541351ca8a857b5459a7aad87a6e8829458b454e17c61d02f1eb3e889c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x458224096cdd93df78aba782257194f476da2515e69ba24b4574553c56e4b22f",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d5f90",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9ea070",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d28g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g1v0Filler.json",
+            "sourceHash" : "8eef1929335d9bac8d5c05ef301c926571d6682472044a8da5672a9718114db8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x87793e8803f74cb62fcadb88b9d4f4918ad48a14c23033b29dc89164dfa74d4a",
+                    "mixHash" : "0x72838c627f5169baf0fb694eaa5780a6b8a7eeb064d5eef5873678ed68196be2",
+                    "nonce" : "0xfb65ad4800b50bd9",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc89d9f825601f3e3d3e33a5d4da3096399d87f9323e4869f42d6894d2660ff52",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa0c89d9f825601f3e3d3e33a5d4da3096399d87f9323e4869f42d6894d2660ff52a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a072838c627f5169baf0fb694eaa5780a6b8a7eeb064d5eef5873678ed68196be288fb65ad4800b50bd9f8a3f8a1800183015f9094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ca08a7156a20980bf7aa66c2b6258ea93c7164e7468c16cfa91fa64c7517459e89aa0416ef5541351ca8a857b5459a7aad87a6e8829458b454e17c61d02f1eb3e889cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a7156a20980bf7aa66c2b6258ea93c7164e7468c16cfa91fa64c7517459e89a",
+                        "s" : "0x416ef5541351ca8a857b5459a7aad87a6e8829458b454e17c61d02f1eb3e889c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x87793e8803f74cb62fcadb88b9d4f4918ad48a14c23033b29dc89164dfa74d4a",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d28g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g1v0Filler.json",
+            "sourceHash" : "8eef1929335d9bac8d5c05ef301c926571d6682472044a8da5672a9718114db8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x88c815fe6efb5ebc3146685bb4030f65ccf4ba78fc19f5910fc3746712f8aedf",
+                    "mixHash" : "0x979ad636be407a1d33b105da9a5807ab7a1f7d02c18460b9dcd9b168098b33bb",
+                    "nonce" : "0xf7854060edef84c0",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc89d9f825601f3e3d3e33a5d4da3096399d87f9323e4869f42d6894d2660ff52",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa0c89d9f825601f3e3d3e33a5d4da3096399d87f9323e4869f42d6894d2660ff52a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0979ad636be407a1d33b105da9a5807ab7a1f7d02c18460b9dcd9b168098b33bb88f7854060edef84c0f8a3f8a1800183015f9094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ca08a7156a20980bf7aa66c2b6258ea93c7164e7468c16cfa91fa64c7517459e89aa0416ef5541351ca8a857b5459a7aad87a6e8829458b454e17c61d02f1eb3e889cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a7156a20980bf7aa66c2b6258ea93c7164e7468c16cfa91fa64c7517459e89a",
+                        "s" : "0x416ef5541351ca8a857b5459a7aad87a6e8829458b454e17c61d02f1eb3e889c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x88c815fe6efb5ebc3146685bb4030f65ccf4ba78fc19f5910fc3746712f8aedf",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g2v0.json
index 7a73a41bf..c53f206cc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g2v0.json
@@ -1,2 +1,325 @@
 {
+    "modexp_d28g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g2v0Filler.json",
+            "sourceHash" : "0640302c90a846339d5d53c80a3a8a4330cda81f24577b518d3a756d7d14ab1b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0xc059982341a0144bef2fa9b806ae64a5984f77225cf00639688b9dc0af6c7a9f",
+                    "mixHash" : "0xe77d4a262d068b1b630a7d158b03ea7dc2fbc2f6ec9f2c00e5799c7645fc3d05",
+                    "nonce" : "0xd2cc39e71370c141",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xe0747ea586bd55cb9453fb1b1ead18bcc261e6a755b420d5b20c670b374b7e5e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4cc126ee6982399868909f259e137d3689b7514a68550f772cd02f2aab5e9b5e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a3f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0747ea586bd55cb9453fb1b1ead18bcc261e6a755b420d5b20c670b374b7e5ea04cc126ee6982399868909f259e137d3689b7514a68550f772cd02f2aab5e9b5ea0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008301adb08203e880a0e77d4a262d068b1b630a7d158b03ea7dc2fbc2f6ec9f2c00e5799c7645fc3d0588d2cc39e71370c141f8a3f8a180018301adb094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ba0b5eae48c93e7147c557d866a83506df2c06c8bac25d541d2aa7845528c80acfba040ecfc0acced29e78a66e995a5908d24a402ddde0649197f5e50586f44600d73c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5eae48c93e7147c557d866a83506df2c06c8bac25d541d2aa7845528c80acfb",
+                        "s" : "0x40ecfc0acced29e78a66e995a5908d24a402ddde0649197f5e50586f44600d73",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc059982341a0144bef2fa9b806ae64a5984f77225cf00639688b9dc0af6c7a9f",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62dadb0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9e5250",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d28g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g2v0Filler.json",
+            "sourceHash" : "0640302c90a846339d5d53c80a3a8a4330cda81f24577b518d3a756d7d14ab1b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x790a97cd8da528585387a69386ecc01c76eed7460aca925c6bce20ccf326d53b",
+                    "mixHash" : "0x1dd912ecf9bbb31affc4f94072e3d6093590302f7c1587655b35728d782db84a",
+                    "nonce" : "0x2ab26a6588c75288",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4cc126ee6982399868909f259e137d3689b7514a68550f772cd02f2aab5e9b5e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa04cc126ee6982399868909f259e137d3689b7514a68550f772cd02f2aab5e9b5ea03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a01dd912ecf9bbb31affc4f94072e3d6093590302f7c1587655b35728d782db84a882ab26a6588c75288f8a3f8a180018301adb094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ba0b5eae48c93e7147c557d866a83506df2c06c8bac25d541d2aa7845528c80acfba040ecfc0acced29e78a66e995a5908d24a402ddde0649197f5e50586f44600d73c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5eae48c93e7147c557d866a83506df2c06c8bac25d541d2aa7845528c80acfb",
+                        "s" : "0x40ecfc0acced29e78a66e995a5908d24a402ddde0649197f5e50586f44600d73",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x790a97cd8da528585387a69386ecc01c76eed7460aca925c6bce20ccf326d53b",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d28g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g2v0Filler.json",
+            "sourceHash" : "0640302c90a846339d5d53c80a3a8a4330cda81f24577b518d3a756d7d14ab1b"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x885b9f25cd39b8bb9b11754331d70c51fe0b31ee63b9b726823be121ea94ae0e",
+                    "mixHash" : "0x33ecbe5e74ad09ea664400ffa85c4adb71b19916da8bb32efd6363b0e5666ada",
+                    "nonce" : "0xbe61eb33326991ba",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4cc126ee6982399868909f259e137d3689b7514a68550f772cd02f2aab5e9b5e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa04cc126ee6982399868909f259e137d3689b7514a68550f772cd02f2aab5e9b5ea03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a033ecbe5e74ad09ea664400ffa85c4adb71b19916da8bb32efd6363b0e5666ada88be61eb33326991baf8a3f8a180018301adb094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ba0b5eae48c93e7147c557d866a83506df2c06c8bac25d541d2aa7845528c80acfba040ecfc0acced29e78a66e995a5908d24a402ddde0649197f5e50586f44600d73c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5eae48c93e7147c557d866a83506df2c06c8bac25d541d2aa7845528c80acfb",
+                        "s" : "0x40ecfc0acced29e78a66e995a5908d24a402ddde0649197f5e50586f44600d73",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x885b9f25cd39b8bb9b11754331d70c51fe0b31ee63b9b726823be121ea94ae0e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g3v0.json
index 7a73a41bf..78a717154 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g3v0.json
@@ -1,2 +1,325 @@
 {
+    "modexp_d28g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g3v0Filler.json",
+            "sourceHash" : "7fe7f49e19e4da1e3cce4c45de964baef053f9c35c5ccddcbd1a467d3f9b5985"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xd0169b8e1dac631705374b35d8caa831a8a098ba92b05b6bbf686a4398672951",
+                    "mixHash" : "0xfd2ee385d7604367a70680701b26e2fc2a2d010f4bbf68fcd730bb1cb46a7180",
+                    "nonce" : "0x1c3cc364cc5fb0f3",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x2e53ca1bf0ecf8fb12de725dc42b5115052825e173cfafde3adbbaaa361a828d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe87631c7ecfc469c3fb901c9df6c7602215a3b1b1736459734026d6f325b9283",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a3f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e53ca1bf0ecf8fb12de725dc42b5115052825e173cfafde3adbbaaa361a828da0e87631c7ecfc469c3fb901c9df6c7602215a3b1b1736459734026d6f325b9283a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083030d408203e880a0fd2ee385d7604367a70680701b26e2fc2a2d010f4bbf68fcd730bb1cb46a7180881c3cc364cc5fb0f3f8a3f8a1800183030d4094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ca03e66eafb50988fa4cbb9005272e57ddcbca3f2a4c0c6cd67f1ea76f91417d9dda02a2047c8aad3dcc177ffb0aab9365a7cbd761e812ee234e4da3a08831d66fd39c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e66eafb50988fa4cbb9005272e57ddcbca3f2a4c0c6cd67f1ea76f91417d9dd",
+                        "s" : "0x2a2047c8aad3dcc177ffb0aab9365a7cbd761e812ee234e4da3a08831d66fd39",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd0169b8e1dac631705374b35d8caa831a8a098ba92b05b6bbf686a4398672951",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62f0d40",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9cf2c0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d28g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g3v0Filler.json",
+            "sourceHash" : "7fe7f49e19e4da1e3cce4c45de964baef053f9c35c5ccddcbd1a467d3f9b5985"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x7fb650833a986475f336371f5b4fefd8a4b174d4991a262ba628f8d8c12e24ac",
+                    "mixHash" : "0xd5b2dc816870c397d82b22d4334e98c2355a2e5468448831b526a7b70b6c67b9",
+                    "nonce" : "0xc65b629ac4658a50",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe87631c7ecfc469c3fb901c9df6c7602215a3b1b1736459734026d6f325b9283",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa0e87631c7ecfc469c3fb901c9df6c7602215a3b1b1736459734026d6f325b9283a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0d5b2dc816870c397d82b22d4334e98c2355a2e5468448831b526a7b70b6c67b988c65b629ac4658a50f8a3f8a1800183030d4094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ca03e66eafb50988fa4cbb9005272e57ddcbca3f2a4c0c6cd67f1ea76f91417d9dda02a2047c8aad3dcc177ffb0aab9365a7cbd761e812ee234e4da3a08831d66fd39c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e66eafb50988fa4cbb9005272e57ddcbca3f2a4c0c6cd67f1ea76f91417d9dd",
+                        "s" : "0x2a2047c8aad3dcc177ffb0aab9365a7cbd761e812ee234e4da3a08831d66fd39",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7fb650833a986475f336371f5b4fefd8a4b174d4991a262ba628f8d8c12e24ac",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d28g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g3v0Filler.json",
+            "sourceHash" : "7fe7f49e19e4da1e3cce4c45de964baef053f9c35c5ccddcbd1a467d3f9b5985"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x8b9496bbf27b94b2610fdcfff185d2ac1ca18841a94265a7db57d66f24fcaf59",
+                    "mixHash" : "0x128849cf44dc1d362f5c45289f0ab5409c8984faa5b1abd68c6859c267945aa4",
+                    "nonce" : "0x9c045cd02d8f85bb",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe87631c7ecfc469c3fb901c9df6c7602215a3b1b1736459734026d6f325b9283",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa0e87631c7ecfc469c3fb901c9df6c7602215a3b1b1736459734026d6f325b9283a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0128849cf44dc1d362f5c45289f0ab5409c8984faa5b1abd68c6859c267945aa4889c045cd02d8f85bbf8a3f8a1800183030d4094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000001ca03e66eafb50988fa4cbb9005272e57ddcbca3f2a4c0c6cd67f1ea76f91417d9dda02a2047c8aad3dcc177ffb0aab9365a7cbd761e812ee234e4da3a08831d66fd39c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e66eafb50988fa4cbb9005272e57ddcbca3f2a4c0c6cd67f1ea76f91417d9dd",
+                        "s" : "0x2a2047c8aad3dcc177ffb0aab9365a7cbd761e812ee234e4da3a08831d66fd39",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8b9496bbf27b94b2610fdcfff185d2ac1ca18841a94265a7db57d66f24fcaf59",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0.json
index 6828e8dd3..390985e54 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d29g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0Filler.json",
             "sourceHash" : "91574e9b830a43873f67bbae114610fe7486f72d6351750b8cd564dbb4d2b448"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb841",
-                    "hash" : "0xafa6bcd4a8301e8b53d541195d1690f51dd52c78e7216fe437d6dac37cf66a79",
-                    "mixHash" : "0xccb2c366f0d0c6c3416f44ec98635e0521dd07958718b038139984a86af6db84",
-                    "nonce" : "0x97ddf8cc117a457b",
+                    "hash" : "0x4dbd868c647bab1fc33e210ff1b2d36a8c17b70d2755f5cc21e3c1b351074882",
+                    "mixHash" : "0x6bd0458277a5789af9314b8be6872a03977cd91d58e9429cedc2f90294126be6",
+                    "nonce" : "0x537ceb03166f89d9",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x62203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x6a315c4458a7e36a3dd3086bfe229fd5e9d4eaf5353a0d386a900938d8691f4c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fb1510c4db53ccef9a660c59fee78c5ecd2e3c02b10baa89fb8208515529d39a06a315c4458a7e36a3dd3086bfe229fd5e9d4eaf5353a0d386a900938d8691f4ca062203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0ccb2c366f0d0c6c3416f44ec98635e0521dd07958718b038139984a86af6db848897ddf8cc117a457bf8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ba0456029b38db2d324da3df0b727dff002315d9be056cb228963b86308ff4e9066a014fce2f2cbadb4d21086b19eb74f8341bdf6137e972ff22cd1791f6cebbaa48ac0",
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fb1510c4db53ccef9a660c59fee78c5ecd2e3c02b10baa89fb8208515529d39a06a315c4458a7e36a3dd3086bfe229fd5e9d4eaf5353a0d386a900938d8691f4ca062203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a06bd0458277a5789af9314b8be6872a03977cd91d58e9429cedc2f90294126be688537ceb03166f89d9f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ba0456029b38db2d324da3df0b727dff002315d9be056cb228963b86308ff4e9066a014fce2f2cbadb4d21086b19eb74f8341bdf6137e972ff22cd1791f6cebbaa48ac0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xafa6bcd4a8301e8b53d541195d1690f51dd52c78e7216fe437d6dac37cf66a79",
+        "lastblockhash" : "0x4dbd868c647bab1fc33e210ff1b2d36a8c17b70d2755f5cc21e3c1b351074882",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d29g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0Filler.json",
             "sourceHash" : "91574e9b830a43873f67bbae114610fe7486f72d6351750b8cd564dbb4d2b448"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb841",
-                    "hash" : "0x711b483f9bea80deb6582c26e5019e873a872659fc00376f6f73488a02f8dd8c",
-                    "mixHash" : "0x63f98b2d31e51a7b21f181bd404efa32f4882000324a9d95737951f26f75ef33",
-                    "nonce" : "0x868bddffb75d92bb",
+                    "hash" : "0xb7d5d3741c39d3f79102e1b025362016eded501055b3e944ad8262f3865ace03",
+                    "mixHash" : "0xea104ce6aedcef2da8c44f86b6b487a75c20d8a5ad0a5261bd1566ab3b6d9d6b",
+                    "nonce" : "0x526636c2c9371ec8",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0x6a315c4458a7e36a3dd3086bfe229fd5e9d4eaf5353a0d386a900938d8691f4c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa06a315c4458a7e36a3dd3086bfe229fd5e9d4eaf5353a0d386a900938d8691f4ca03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a063f98b2d31e51a7b21f181bd404efa32f4882000324a9d95737951f26f75ef3388868bddffb75d92bbf8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ba0456029b38db2d324da3df0b727dff002315d9be056cb228963b86308ff4e9066a014fce2f2cbadb4d21086b19eb74f8341bdf6137e972ff22cd1791f6cebbaa48ac0",
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa06a315c4458a7e36a3dd3086bfe229fd5e9d4eaf5353a0d386a900938d8691f4ca03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0ea104ce6aedcef2da8c44f86b6b487a75c20d8a5ad0a5261bd1566ab3b6d9d6b88526636c2c9371ec8f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ba0456029b38db2d324da3df0b727dff002315d9be056cb228963b86308ff4e9066a014fce2f2cbadb4d21086b19eb74f8341bdf6137e972ff22cd1791f6cebbaa48ac0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x711b483f9bea80deb6582c26e5019e873a872659fc00376f6f73488a02f8dd8c",
+        "lastblockhash" : "0xb7d5d3741c39d3f79102e1b025362016eded501055b3e944ad8262f3865ace03",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d29g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0Filler.json",
             "sourceHash" : "91574e9b830a43873f67bbae114610fe7486f72d6351750b8cd564dbb4d2b448"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb841",
-                    "hash" : "0x93bc191c5c61b61d90ffd69361314da77f7b13d5cfe26ef2cddedac7723edb8b",
-                    "mixHash" : "0x55cdfc8a1ae586ef844fd3af61eab702f5e0e460bedd53b961dbb4d20a6c032d",
-                    "nonce" : "0x46af1f15d785885e",
+                    "hash" : "0x47db97b19667ff115edee18c592243bed3ddb149e230687f540f278093717aa1",
+                    "mixHash" : "0xf13df1ad4603506e89ca7642ba997c183307355c89300672ccac80921dcc240a",
+                    "nonce" : "0xe39182e054f70425",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0x6a315c4458a7e36a3dd3086bfe229fd5e9d4eaf5353a0d386a900938d8691f4c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa06a315c4458a7e36a3dd3086bfe229fd5e9d4eaf5353a0d386a900938d8691f4ca03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a055cdfc8a1ae586ef844fd3af61eab702f5e0e460bedd53b961dbb4d20a6c032d8846af1f15d785885ef8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ba0456029b38db2d324da3df0b727dff002315d9be056cb228963b86308ff4e9066a014fce2f2cbadb4d21086b19eb74f8341bdf6137e972ff22cd1791f6cebbaa48ac0",
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa06a315c4458a7e36a3dd3086bfe229fd5e9d4eaf5353a0d386a900938d8691f4ca03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0f13df1ad4603506e89ca7642ba997c183307355c89300672ccac80921dcc240a88e39182e054f70425f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ba0456029b38db2d324da3df0b727dff002315d9be056cb228963b86308ff4e9066a014fce2f2cbadb4d21086b19eb74f8341bdf6137e972ff22cd1791f6cebbaa48ac0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93bc191c5c61b61d90ffd69361314da77f7b13d5cfe26ef2cddedac7723edb8b",
+        "lastblockhash" : "0x47db97b19667ff115edee18c592243bed3ddb149e230687f540f278093717aa1",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g1v0.json
index 7a73a41bf..058431d87 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d29g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g1v0Filler.json",
+            "sourceHash" : "428f5080ce7a99928add74b31082c5d7b1a60a6e8a495eeb6863c2fa0ccbd9ab"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x3eed5ee0b8a014e56f7864ae8905952e2f8627cc655852377509fc9df76249a2",
+                    "mixHash" : "0xcbc20a31afe97690075bb4c26b443f23eef37e2be646a07d6ffff1fd232cc3df",
+                    "nonce" : "0x50b6595b1536f20a",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x62203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055",
+                    "stateRoot" : "0x1fb1510c4db53ccef9a660c59fee78c5ecd2e3c02b10baa89fb8208515529d39",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x201ab4dd2248cc1f6e7c153de7fccbfbea0a8e9c1483a73a84f12603d88d25b6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fb1510c4db53ccef9a660c59fee78c5ecd2e3c02b10baa89fb8208515529d39a0201ab4dd2248cc1f6e7c153de7fccbfbea0a8e9c1483a73a84f12603d88d25b6a062203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0cbc20a31afe97690075bb4c26b443f23eef37e2be646a07d6ffff1fd232cc3df8850b6595b1536f20af8a3f8a1800183015f9094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ba026a715054759c3027cff5979d87a4eb2367565bb9d8c5dca3ded42fa86c57912a0797c887e41538f18e8208369b40093f9bfd187e39f096a191ddad94e610dc688c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x26a715054759c3027cff5979d87a4eb2367565bb9d8c5dca3ded42fa86c57912",
+                        "s" : "0x797c887e41538f18e8208369b40093f9bfd187e39f096a191ddad94e610dc688",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3eed5ee0b8a014e56f7864ae8905952e2f8627cc655852377509fc9df76249a2",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d29g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g1v0Filler.json",
+            "sourceHash" : "428f5080ce7a99928add74b31082c5d7b1a60a6e8a495eeb6863c2fa0ccbd9ab"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0xcf2367076026bdf9e8577c37f72e7dcfd8e203ffa1362e5b87ca20a6935e64c7",
+                    "mixHash" : "0xf3f1aac9318aef96fe23f7614c9ecb0945906945486f0e211d7b49ca8adf9d8a",
+                    "nonce" : "0x804b23c010da6dc6",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x201ab4dd2248cc1f6e7c153de7fccbfbea0a8e9c1483a73a84f12603d88d25b6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa0201ab4dd2248cc1f6e7c153de7fccbfbea0a8e9c1483a73a84f12603d88d25b6a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0f3f1aac9318aef96fe23f7614c9ecb0945906945486f0e211d7b49ca8adf9d8a88804b23c010da6dc6f8a3f8a1800183015f9094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ba026a715054759c3027cff5979d87a4eb2367565bb9d8c5dca3ded42fa86c57912a0797c887e41538f18e8208369b40093f9bfd187e39f096a191ddad94e610dc688c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x26a715054759c3027cff5979d87a4eb2367565bb9d8c5dca3ded42fa86c57912",
+                        "s" : "0x797c887e41538f18e8208369b40093f9bfd187e39f096a191ddad94e610dc688",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcf2367076026bdf9e8577c37f72e7dcfd8e203ffa1362e5b87ca20a6935e64c7",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d29g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g1v0Filler.json",
+            "sourceHash" : "428f5080ce7a99928add74b31082c5d7b1a60a6e8a495eeb6863c2fa0ccbd9ab"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x658b2c683d05d47d45120657b9f472a93109f2e1f6770e09a531a50cb0aec9fd",
+                    "mixHash" : "0x3d0ef4c08fd156e77f40c00c35fc15b03edcd3c8293da3e7413af330dc81422f",
+                    "nonce" : "0xd656e7e48d5dcc54",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x201ab4dd2248cc1f6e7c153de7fccbfbea0a8e9c1483a73a84f12603d88d25b6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa0201ab4dd2248cc1f6e7c153de7fccbfbea0a8e9c1483a73a84f12603d88d25b6a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a03d0ef4c08fd156e77f40c00c35fc15b03edcd3c8293da3e7413af330dc81422f88d656e7e48d5dcc54f8a3f8a1800183015f9094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ba026a715054759c3027cff5979d87a4eb2367565bb9d8c5dca3ded42fa86c57912a0797c887e41538f18e8208369b40093f9bfd187e39f096a191ddad94e610dc688c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x26a715054759c3027cff5979d87a4eb2367565bb9d8c5dca3ded42fa86c57912",
+                        "s" : "0x797c887e41538f18e8208369b40093f9bfd187e39f096a191ddad94e610dc688",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x658b2c683d05d47d45120657b9f472a93109f2e1f6770e09a531a50cb0aec9fd",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g2v0.json
index 7a73a41bf..7af73c13c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d29g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g2v0Filler.json",
+            "sourceHash" : "068e9ccbd96b7369e3882d0a262d447b52cbfdec6b4e8fd39bcfa3800267a6e0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x6ed774a5d3bd4c37d847a4f95f77850195b96c218122b61f646f3efbb33dfec5",
+                    "mixHash" : "0xb7cad2c134a6f27fdbb6bbb9807c330ddf3fd6ce081d28fadfa9afaf9c39569d",
+                    "nonce" : "0xc7e3dc81f5a7cd58",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x62203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055",
+                    "stateRoot" : "0x1fb1510c4db53ccef9a660c59fee78c5ecd2e3c02b10baa89fb8208515529d39",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe717dfd6edc49c72276facf2c2a09de0cdb85a81e192ef4a53836e77df7f44ec",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fb1510c4db53ccef9a660c59fee78c5ecd2e3c02b10baa89fb8208515529d39a0e717dfd6edc49c72276facf2c2a09de0cdb85a81e192ef4a53836e77df7f44eca062203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0b7cad2c134a6f27fdbb6bbb9807c330ddf3fd6ce081d28fadfa9afaf9c39569d88c7e3dc81f5a7cd58f8a3f8a180018301adb094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ba0187a02b824360c77dc66dd1dbf132a83a1baccabbda5ab914e9bf113c5c54654a048658c8a659a250cb110c9175f2994de25ccffd3960dc301fa3c285892377058c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x187a02b824360c77dc66dd1dbf132a83a1baccabbda5ab914e9bf113c5c54654",
+                        "s" : "0x48658c8a659a250cb110c9175f2994de25ccffd3960dc301fa3c285892377058",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6ed774a5d3bd4c37d847a4f95f77850195b96c218122b61f646f3efbb33dfec5",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d29g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g2v0Filler.json",
+            "sourceHash" : "068e9ccbd96b7369e3882d0a262d447b52cbfdec6b4e8fd39bcfa3800267a6e0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x69c7adcbf7ad736140e888cfed0702271acc6ab7579817d7cc6ce8f5f6fc984f",
+                    "mixHash" : "0x367d1fc3d1212f12f1d8ad1ffd16a3c88e387b4e7d4c5300abf8e14da2dcccc7",
+                    "nonce" : "0x7f344ff0b0ff56c0",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe717dfd6edc49c72276facf2c2a09de0cdb85a81e192ef4a53836e77df7f44ec",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa0e717dfd6edc49c72276facf2c2a09de0cdb85a81e192ef4a53836e77df7f44eca03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0367d1fc3d1212f12f1d8ad1ffd16a3c88e387b4e7d4c5300abf8e14da2dcccc7887f344ff0b0ff56c0f8a3f8a180018301adb094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ba0187a02b824360c77dc66dd1dbf132a83a1baccabbda5ab914e9bf113c5c54654a048658c8a659a250cb110c9175f2994de25ccffd3960dc301fa3c285892377058c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x187a02b824360c77dc66dd1dbf132a83a1baccabbda5ab914e9bf113c5c54654",
+                        "s" : "0x48658c8a659a250cb110c9175f2994de25ccffd3960dc301fa3c285892377058",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x69c7adcbf7ad736140e888cfed0702271acc6ab7579817d7cc6ce8f5f6fc984f",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d29g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g2v0Filler.json",
+            "sourceHash" : "068e9ccbd96b7369e3882d0a262d447b52cbfdec6b4e8fd39bcfa3800267a6e0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x21b1dc9d59d8c32138e504b1e387cf3801549d7e8c7ea03a29e282db4efcfc58",
+                    "mixHash" : "0x4536f18395810e15391d5bd8e0b2d8929bbf7bb1558b34ad45122e82aa7bd13f",
+                    "nonce" : "0xeb153429f57fe253",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe717dfd6edc49c72276facf2c2a09de0cdb85a81e192ef4a53836e77df7f44ec",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa0e717dfd6edc49c72276facf2c2a09de0cdb85a81e192ef4a53836e77df7f44eca03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a04536f18395810e15391d5bd8e0b2d8929bbf7bb1558b34ad45122e82aa7bd13f88eb153429f57fe253f8a3f8a180018301adb094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ba0187a02b824360c77dc66dd1dbf132a83a1baccabbda5ab914e9bf113c5c54654a048658c8a659a250cb110c9175f2994de25ccffd3960dc301fa3c285892377058c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x187a02b824360c77dc66dd1dbf132a83a1baccabbda5ab914e9bf113c5c54654",
+                        "s" : "0x48658c8a659a250cb110c9175f2994de25ccffd3960dc301fa3c285892377058",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x21b1dc9d59d8c32138e504b1e387cf3801549d7e8c7ea03a29e282db4efcfc58",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g3v0.json
index 7a73a41bf..b73bb40af 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d29g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g3v0Filler.json",
+            "sourceHash" : "4dd2f3345970e5cf9e33ca2d7d0f2e453b09ccf2bdd37f6159733aa17f506717"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x5513d429bdd4592352741003b1178f8d84d80788dbfd97794d18ca0387268d61",
+                    "mixHash" : "0x149df05cc7f1ca36252b462bd70d5b67b9e7a447b1c9756c4171e4361995b52a",
+                    "nonce" : "0x3e6b8eb1baae89ca",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x62203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055",
+                    "stateRoot" : "0x1fb1510c4db53ccef9a660c59fee78c5ecd2e3c02b10baa89fb8208515529d39",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x97c1cce12c386875b0bb716a96c138d04876753da6cffb1840a14bbd7af25f2c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fb1510c4db53ccef9a660c59fee78c5ecd2e3c02b10baa89fb8208515529d39a097c1cce12c386875b0bb716a96c138d04876753da6cffb1840a14bbd7af25f2ca062203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0149df05cc7f1ca36252b462bd70d5b67b9e7a447b1c9756c4171e4361995b52a883e6b8eb1baae89caf8a3f8a1800183030d4094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ca0f52159942bb4671178e16c649dd9006aca00faf94d17d42a8ae430f72a4a3fb2a0660bdff6f2d89b40ab82a22e975a6108069c56b3340390cbd5091c627fc81f8bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf52159942bb4671178e16c649dd9006aca00faf94d17d42a8ae430f72a4a3fb2",
+                        "s" : "0x660bdff6f2d89b40ab82a22e975a6108069c56b3340390cbd5091c627fc81f8b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5513d429bdd4592352741003b1178f8d84d80788dbfd97794d18ca0387268d61",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d29g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g3v0Filler.json",
+            "sourceHash" : "4dd2f3345970e5cf9e33ca2d7d0f2e453b09ccf2bdd37f6159733aa17f506717"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x8ff4d465128d70aa043c6e6eb0c16be08054bbec46004adf6a9af43ba2289f7b",
+                    "mixHash" : "0x3eabf941507b6c4c2be8104659e3e52bd7c6cd2407620e7a9ed909486e824ba1",
+                    "nonce" : "0xd4ea7c033dd6ed6e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x97c1cce12c386875b0bb716a96c138d04876753da6cffb1840a14bbd7af25f2c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa097c1cce12c386875b0bb716a96c138d04876753da6cffb1840a14bbd7af25f2ca03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a03eabf941507b6c4c2be8104659e3e52bd7c6cd2407620e7a9ed909486e824ba188d4ea7c033dd6ed6ef8a3f8a1800183030d4094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ca0f52159942bb4671178e16c649dd9006aca00faf94d17d42a8ae430f72a4a3fb2a0660bdff6f2d89b40ab82a22e975a6108069c56b3340390cbd5091c627fc81f8bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf52159942bb4671178e16c649dd9006aca00faf94d17d42a8ae430f72a4a3fb2",
+                        "s" : "0x660bdff6f2d89b40ab82a22e975a6108069c56b3340390cbd5091c627fc81f8b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8ff4d465128d70aa043c6e6eb0c16be08054bbec46004adf6a9af43ba2289f7b",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d29g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g3v0Filler.json",
+            "sourceHash" : "4dd2f3345970e5cf9e33ca2d7d0f2e453b09ccf2bdd37f6159733aa17f506717"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x342730b5cd9b207407aa3d4d6a08190c269be1c4f30e2b1bc2ae8572935591d2",
+                    "mixHash" : "0xcbde3746eb15030b7f8fd044210296e4c48d466efe830bcdf3ca111c65f85bd7",
+                    "nonce" : "0xd2877f740cb4fb2c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x97c1cce12c386875b0bb716a96c138d04876753da6cffb1840a14bbd7af25f2c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa097c1cce12c386875b0bb716a96c138d04876753da6cffb1840a14bbd7af25f2ca03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0cbde3746eb15030b7f8fd044210296e4c48d466efe830bcdf3ca111c65f85bd788d2877f740cb4fb2cf8a3f8a1800183030d4094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001ca0f52159942bb4671178e16c649dd9006aca00faf94d17d42a8ae430f72a4a3fb2a0660bdff6f2d89b40ab82a22e975a6108069c56b3340390cbd5091c627fc81f8bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf52159942bb4671178e16c649dd9006aca00faf94d17d42a8ae430f72a4a3fb2",
+                        "s" : "0x660bdff6f2d89b40ab82a22e975a6108069c56b3340390cbd5091c627fc81f8b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x342730b5cd9b207407aa3d4d6a08190c269be1c4f30e2b1bc2ae8572935591d2",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g0v0.json
index cc2c7883e..590e151fc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d2g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g0v0Filler.json",
             "sourceHash" : "5e98c7ff893ccc9e2424ee893b5559b24128b246b369f837f796456dff264d5f"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05de3259",
-                    "hash" : "0xe69ff862017ea7871f1d131e72c4598c8fff5796dbc25e57bbb772b041285294",
-                    "mixHash" : "0x6ed39e031816378d2dff576df2ad3f2f2ee2f459334a3e882cb1d1c01b82a04e",
-                    "nonce" : "0x2690d4fdae76bbbc",
+                    "hash" : "0xc87e6f2787c026f19ea24aa6bfec53a04e8925aab9c32c133aa6c8edfcd626b6",
+                    "mixHash" : "0x1086bde50916634ac4d09959df75b56508163862bf61d6743c91ac17e09c262b",
+                    "nonce" : "0x7fca1971fbdf0fb2",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x86903dc3a8e4041f0a05333771042ecbb6210573ecb052c4037fa582936742fa",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6dda741ef96d6c8bc732603c9f977e6ea011230229177b55b4988835d151a32a0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a086903dc3a8e4041f0a05333771042ecbb6210573ecb052c4037fa582936742fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405de32598203e880a06ed39e031816378d2dff576df2ad3f2f2ee2f459334a3e882cb1d1c01b82a04e882690d4fdae76bbbcf90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
+                "rlp" : "0xf90307f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6dda741ef96d6c8bc732603c9f977e6ea011230229177b55b4988835d151a32a0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a086903dc3a8e4041f0a05333771042ecbb6210573ecb052c4037fa582936742fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405de32598203e880a01086bde50916634ac4d09959df75b56508163862bf61d6743c91ac17e09c262b887fca1971fbdf0fb2f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe69ff862017ea7871f1d131e72c4598c8fff5796dbc25e57bbb772b041285294",
+        "lastblockhash" : "0xc87e6f2787c026f19ea24aa6bfec53a04e8925aab9c32c133aa6c8edfcd626b6",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -109,8 +109,8 @@
     "modexp_d2g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g0v0Filler.json",
             "sourceHash" : "5e98c7ff893ccc9e2424ee893b5559b24128b246b369f837f796456dff264d5f"
         },
@@ -123,9 +123,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xd1ca",
-                    "hash" : "0x3b40dcceb221d37768351db04e525c0f6671c7df9ab70dab228a2af160d95dc3",
-                    "mixHash" : "0x397f142e87d2ca0ce46d69c6fe697fd9fdd11b049b3d1918f409f93afe02df24",
-                    "nonce" : "0x126cf3a4a18053be",
+                    "hash" : "0x9b8cf85c0f6a3003097188b26be22563e5ba68374a8c7f38a9fe4efc0ddeb633",
+                    "mixHash" : "0x88ea2508548c610cac40286c6a310231331ffbc6fb8ab5dd1601c8a7029bb291",
+                    "nonce" : "0x6b6e5afbe4e085bf",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x5e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0",
@@ -134,7 +134,7 @@
                     "transactionsTrie" : "0xccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a0397f142e87d2ca0ce46d69c6fe697fd9fdd11b049b3d1918f409f93afe02df2488126cf3a4a18053bef90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a088ea2508548c610cac40286c6a310231331ffbc6fb8ab5dd1601c8a7029bb291886b6e5afbe4e085bff90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
@@ -171,7 +171,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b40dcceb221d37768351db04e525c0f6671c7df9ab70dab228a2af160d95dc3",
+        "lastblockhash" : "0x9b8cf85c0f6a3003097188b26be22563e5ba68374a8c7f38a9fe4efc0ddeb633",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -217,8 +217,8 @@
     "modexp_d2g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g0v0Filler.json",
             "sourceHash" : "5e98c7ff893ccc9e2424ee893b5559b24128b246b369f837f796456dff264d5f"
         },
@@ -231,9 +231,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xd1ca",
-                    "hash" : "0x28ac36a8d18e15c0d7902594d883201c30787a64fdc358916672aed31673b22a",
-                    "mixHash" : "0x11f552a842abb9d7e37c4e24e453f2185a7567c90dcc626121a2beab45f2597e",
-                    "nonce" : "0xd4f76dd19e994024",
+                    "hash" : "0xa9b95a17fec6bc0ee0238e49b903749946fe3f57d166cfe70d5e1cc5964f9ddd",
+                    "mixHash" : "0x7f723f84671586767b0071ed5fcb6f4706e5db92cf381eeb6c9094a6a2da7ac0",
+                    "nonce" : "0x20225e76e6e7a38a",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x5e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0",
@@ -242,7 +242,7 @@
                     "transactionsTrie" : "0xccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a011f552a842abb9d7e37c4e24e453f2185a7567c90dcc626121a2beab45f2597e88d4f76dd19e994024f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a07f723f84671586767b0071ed5fcb6f4706e5db92cf381eeb6c9094a6a2da7ac08820225e76e6e7a38af90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
@@ -279,7 +279,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28ac36a8d18e15c0d7902594d883201c30787a64fdc358916672aed31673b22a",
+        "lastblockhash" : "0xa9b95a17fec6bc0ee0238e49b903749946fe3f57d166cfe70d5e1cc5964f9ddd",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g1v0.json
index 7a73a41bf..1ea9e55e6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g1v0.json
@@ -1,2 +1,325 @@
 {
+    "modexp_d2g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g1v0Filler.json",
+            "sourceHash" : "07a0db23ef2ef9ae91af9adeb4ed14b4a6c98b43f0a07f2f70ada3f4489ac056"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x015f90",
+                    "hash" : "0x275c787b73a96daf925bcfbbb5aa13a51dc93606a541c513b1e93ba4b4f777d6",
+                    "mixHash" : "0x85d433993c61cf69b15dc2a4152e00d7ef46a741f5c4b4a1406347837ef2775a",
+                    "nonce" : "0x29d2e6721b24f051",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x22140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59",
+                    "stateRoot" : "0x7bb1bf5b51553025d5f5008c52d39d7e3ed480b625862bc3b70d403ec7492e82",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x72fd38bff5d1be9f0e78754110c3bb85a135ec722cf049798fb73dc14d03927a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bb1bf5b51553025d5f5008c52d39d7e3ed480b625862bc3b70d403ec7492e82a072fd38bff5d1be9f0e78754110c3bb85a135ec722cf049798fb73dc14d03927aa022140012d7300d5a027646b3c3f97683d4af689c0ab818cf01a532204bcb4a59b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083015f908203e880a085d433993c61cf69b15dc2a4152e00d7ef46a741f5c4b4a1406347837ef2775a8829d2e6721b24f051f90104f90101800183015f9094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0351003ed1aebaea665ff3025c75fecdaced8d59633f1d30259c7a6bfb8e4ee92a05f232f0af9fe524de401a4e05ecb88c41d9b11778853d7a0abdc779b82d1e583c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x351003ed1aebaea665ff3025c75fecdaced8d59633f1d30259c7a6bfb8e4ee92",
+                        "s" : "0x5f232f0af9fe524de401a4e05ecb88c41d9b11778853d7a0abdc779b82d1e583",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x275c787b73a96daf925bcfbbb5aa13a51dc93606a541c513b1e93ba4b4f777d6",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d5f90",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9ea070",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d2g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g1v0Filler.json",
+            "sourceHash" : "07a0db23ef2ef9ae91af9adeb4ed14b4a6c98b43f0a07f2f70ada3f4489ac056"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xd1ca",
+                    "hash" : "0x378aabea2c6b73d3e8153837f6a833ab962095badd6cb2502390495ae495e923",
+                    "mixHash" : "0xf381e8b058b95d344cf06abd8cbaff8c848d759834e8961c2aff1533828a03ee",
+                    "nonce" : "0xbcdf728fa71a5ae8",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0",
+                    "stateRoot" : "0xa45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x72fd38bff5d1be9f0e78754110c3bb85a135ec722cf049798fb73dc14d03927a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca072fd38bff5d1be9f0e78754110c3bb85a135ec722cf049798fb73dc14d03927aa05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a0f381e8b058b95d344cf06abd8cbaff8c848d759834e8961c2aff1533828a03ee88bcdf728fa71a5ae8f90104f90101800183015f9094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0351003ed1aebaea665ff3025c75fecdaced8d59633f1d30259c7a6bfb8e4ee92a05f232f0af9fe524de401a4e05ecb88c41d9b11778853d7a0abdc779b82d1e583c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x351003ed1aebaea665ff3025c75fecdaced8d59633f1d30259c7a6bfb8e4ee92",
+                        "s" : "0x5f232f0af9fe524de401a4e05ecb88c41d9b11778853d7a0abdc779b82d1e583",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x378aabea2c6b73d3e8153837f6a833ab962095badd6cb2502390495ae495e923",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d1ca",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f2e36",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d2g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g1v0Filler.json",
+            "sourceHash" : "07a0db23ef2ef9ae91af9adeb4ed14b4a6c98b43f0a07f2f70ada3f4489ac056"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xd1ca",
+                    "hash" : "0xb8f5bcf8929a83410812681b03ae22d108b01cc3a13205c0cf3ecbfd2355152a",
+                    "mixHash" : "0x455c0a46adff503ced18f93ee5d9335aee056c3559c6e085a3ca63405516ce31",
+                    "nonce" : "0xc35835010ebdf811",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0",
+                    "stateRoot" : "0xa45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x72fd38bff5d1be9f0e78754110c3bb85a135ec722cf049798fb73dc14d03927a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca072fd38bff5d1be9f0e78754110c3bb85a135ec722cf049798fb73dc14d03927aa05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a0455c0a46adff503ced18f93ee5d9335aee056c3559c6e085a3ca63405516ce3188c35835010ebdf811f90104f90101800183015f9094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0351003ed1aebaea665ff3025c75fecdaced8d59633f1d30259c7a6bfb8e4ee92a05f232f0af9fe524de401a4e05ecb88c41d9b11778853d7a0abdc779b82d1e583c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x351003ed1aebaea665ff3025c75fecdaced8d59633f1d30259c7a6bfb8e4ee92",
+                        "s" : "0x5f232f0af9fe524de401a4e05ecb88c41d9b11778853d7a0abdc779b82d1e583",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb8f5bcf8929a83410812681b03ae22d108b01cc3a13205c0cf3ecbfd2355152a",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d1ca",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f2e36",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g2v0.json
index 7a73a41bf..20a55319c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g2v0.json
@@ -1,2 +1,325 @@
 {
+    "modexp_d2g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g2v0Filler.json",
+            "sourceHash" : "3c6024b8a89db408cf7904a89420695101fc15d6c8ea300144657877623514a3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0xd8e137348cf9ac6c38dbde469ae938ad64153331c27a42eba0d13384676a2cc5",
+                    "mixHash" : "0x24746f2859e72e5dfe7d4cba8d6a3958fad3fc846d37e6e7ffca379d67aa0b2e",
+                    "nonce" : "0x149bcee7d7d6bb7b",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0xe0747ea586bd55cb9453fb1b1ead18bcc261e6a755b420d5b20c670b374b7e5e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc63efef5ca0d9788754163cd1b2596866da6eb460840556045bd397a5f035f74",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0747ea586bd55cb9453fb1b1ead18bcc261e6a755b420d5b20c670b374b7e5ea0c63efef5ca0d9788754163cd1b2596866da6eb460840556045bd397a5f035f74a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008301adb08203e880a024746f2859e72e5dfe7d4cba8d6a3958fad3fc846d37e6e7ffca379d67aa0b2e88149bcee7d7d6bb7bf90104f9010180018301adb094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0fe420af3f8bd46481823968a7a2779b1151ea4467ac303d278fdb868e6937d8ea002204683addbb932f01afb0a80ddf43f95f017b7966db4b1db85ebe587f60d02c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe420af3f8bd46481823968a7a2779b1151ea4467ac303d278fdb868e6937d8e",
+                        "s" : "0x02204683addbb932f01afb0a80ddf43f95f017b7966db4b1db85ebe587f60d02",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd8e137348cf9ac6c38dbde469ae938ad64153331c27a42eba0d13384676a2cc5",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62dadb0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9e5250",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d2g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g2v0Filler.json",
+            "sourceHash" : "3c6024b8a89db408cf7904a89420695101fc15d6c8ea300144657877623514a3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xd1ca",
+                    "hash" : "0x1cce9f701b7c8955c0663685c25094ffd0a54cad974d648d145f53751611bef3",
+                    "mixHash" : "0xd21cd92fafb0e2a5c54070a87fd2cf6a8094d29056b0808a0274a08537a4ec48",
+                    "nonce" : "0x74a7911b94aa67a5",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0",
+                    "stateRoot" : "0xa45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc63efef5ca0d9788754163cd1b2596866da6eb460840556045bd397a5f035f74",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca0c63efef5ca0d9788754163cd1b2596866da6eb460840556045bd397a5f035f74a05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a0d21cd92fafb0e2a5c54070a87fd2cf6a8094d29056b0808a0274a08537a4ec488874a7911b94aa67a5f90104f9010180018301adb094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0fe420af3f8bd46481823968a7a2779b1151ea4467ac303d278fdb868e6937d8ea002204683addbb932f01afb0a80ddf43f95f017b7966db4b1db85ebe587f60d02c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe420af3f8bd46481823968a7a2779b1151ea4467ac303d278fdb868e6937d8e",
+                        "s" : "0x02204683addbb932f01afb0a80ddf43f95f017b7966db4b1db85ebe587f60d02",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1cce9f701b7c8955c0663685c25094ffd0a54cad974d648d145f53751611bef3",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d1ca",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f2e36",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d2g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g2v0Filler.json",
+            "sourceHash" : "3c6024b8a89db408cf7904a89420695101fc15d6c8ea300144657877623514a3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xd1ca",
+                    "hash" : "0x22b75b2bf18f7c6d96c10f00383999370fec95f99dc52cbd9bafa50cd28668aa",
+                    "mixHash" : "0x89a34d2efda8c5c8aeaa9a49344a99d8a1ee3145b3edc0bc85e1c12f232c79cc",
+                    "nonce" : "0xd00f5128308e1597",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0",
+                    "stateRoot" : "0xa45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc63efef5ca0d9788754163cd1b2596866da6eb460840556045bd397a5f035f74",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca0c63efef5ca0d9788754163cd1b2596866da6eb460840556045bd397a5f035f74a05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a089a34d2efda8c5c8aeaa9a49344a99d8a1ee3145b3edc0bc85e1c12f232c79cc88d00f5128308e1597f90104f9010180018301adb094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0fe420af3f8bd46481823968a7a2779b1151ea4467ac303d278fdb868e6937d8ea002204683addbb932f01afb0a80ddf43f95f017b7966db4b1db85ebe587f60d02c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe420af3f8bd46481823968a7a2779b1151ea4467ac303d278fdb868e6937d8e",
+                        "s" : "0x02204683addbb932f01afb0a80ddf43f95f017b7966db4b1db85ebe587f60d02",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x22b75b2bf18f7c6d96c10f00383999370fec95f99dc52cbd9bafa50cd28668aa",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d1ca",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f2e36",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g3v0.json
index 7a73a41bf..43bdcb31d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g3v0.json
@@ -1,2 +1,325 @@
 {
+    "modexp_d2g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g3v0Filler.json",
+            "sourceHash" : "e3e0fe3f68ca2078e47103e591dde83d42c14a222dab0f442e282e25b306cbc0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x433e1ff12ba790c04517160c3380de00cb571824b66989be6a4fdf84f750ff94",
+                    "mixHash" : "0xe5c418223a6814806c65f317eb649a3bdbd6a810980260f54b777b599b1a7454",
+                    "nonce" : "0x8876ce7012e18b61",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x2e53ca1bf0ecf8fb12de725dc42b5115052825e173cfafde3adbbaaa361a828d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6c56047bf6fe61a0b4a5f9664073fe8fb9c854adf4a46c1c35b223781372ed60",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e53ca1bf0ecf8fb12de725dc42b5115052825e173cfafde3adbbaaa361a828da06c56047bf6fe61a0b4a5f9664073fe8fb9c854adf4a46c1c35b223781372ed60a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083030d408203e880a0e5c418223a6814806c65f317eb649a3bdbd6a810980260f54b777b599b1a7454888876ce7012e18b61f90104f90101800183030d4094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ba0ff79988bdc8a07e07eff0467aea12e41851bb6ac24ba26070ba6b231c6771b36a0113476b7cbec8adf4c43a481b2b8d29cfae08c4d7aa7ed8357c34cb0c8c1a430c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff79988bdc8a07e07eff0467aea12e41851bb6ac24ba26070ba6b231c6771b36",
+                        "s" : "0x113476b7cbec8adf4c43a481b2b8d29cfae08c4d7aa7ed8357c34cb0c8c1a430",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x433e1ff12ba790c04517160c3380de00cb571824b66989be6a4fdf84f750ff94",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62f0d40",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9cf2c0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d2g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g3v0Filler.json",
+            "sourceHash" : "e3e0fe3f68ca2078e47103e591dde83d42c14a222dab0f442e282e25b306cbc0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xd1ca",
+                    "hash" : "0xc8448dc7d5485937b7928315100b445d59dff51479f37999359665d2704c3352",
+                    "mixHash" : "0x99d5a65488dbf65f23f966a5b75380ebc9be0e6774fab12e29cb076edf0d3519",
+                    "nonce" : "0x56d657d60c4321b2",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0",
+                    "stateRoot" : "0xa45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6c56047bf6fe61a0b4a5f9664073fe8fb9c854adf4a46c1c35b223781372ed60",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca06c56047bf6fe61a0b4a5f9664073fe8fb9c854adf4a46c1c35b223781372ed60a05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a099d5a65488dbf65f23f966a5b75380ebc9be0e6774fab12e29cb076edf0d35198856d657d60c4321b2f90104f90101800183030d4094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ba0ff79988bdc8a07e07eff0467aea12e41851bb6ac24ba26070ba6b231c6771b36a0113476b7cbec8adf4c43a481b2b8d29cfae08c4d7aa7ed8357c34cb0c8c1a430c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff79988bdc8a07e07eff0467aea12e41851bb6ac24ba26070ba6b231c6771b36",
+                        "s" : "0x113476b7cbec8adf4c43a481b2b8d29cfae08c4d7aa7ed8357c34cb0c8c1a430",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc8448dc7d5485937b7928315100b445d59dff51479f37999359665d2704c3352",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d1ca",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f2e36",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d2g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g3v0Filler.json",
+            "sourceHash" : "e3e0fe3f68ca2078e47103e591dde83d42c14a222dab0f442e282e25b306cbc0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xd1ca",
+                    "hash" : "0xf5cbc24a14cf42941cdeac1bdccce0a667e123ae9ae7630501d4490ba9f0d7c1",
+                    "mixHash" : "0x01d9cb50d715bcc64148219cf85465942c1af926da7f92baebef41016016227c",
+                    "nonce" : "0x48f0afd8b873df85",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0",
+                    "stateRoot" : "0xa45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6c56047bf6fe61a0b4a5f9664073fe8fb9c854adf4a46c1c35b223781372ed60",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90304f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca06c56047bf6fe61a0b4a5f9664073fe8fb9c854adf4a46c1c35b223781372ed60a05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a001d9cb50d715bcc64148219cf85465942c1af926da7f92baebef41016016227c8848f0afd8b873df85f90104f90101800183030d4094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ba0ff79988bdc8a07e07eff0467aea12e41851bb6ac24ba26070ba6b231c6771b36a0113476b7cbec8adf4c43a481b2b8d29cfae08c4d7aa7ed8357c34cb0c8c1a430c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff79988bdc8a07e07eff0467aea12e41851bb6ac24ba26070ba6b231c6771b36",
+                        "s" : "0x113476b7cbec8adf4c43a481b2b8d29cfae08c4d7aa7ed8357c34cb0c8c1a430",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf5cbc24a14cf42941cdeac1bdccce0a667e123ae9ae7630501d4490ba9f0d7c1",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d1ca",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f2e36",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g0v0.json
index bdd97f416..f6bd6174b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d30g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g0v0Filler.json",
             "sourceHash" : "65ceecd76b7c180a3c9399c9f8bc4f517fe95735d8c9272a4fb9b1e70d7215f5"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb8c4",
-                    "hash" : "0x6e0d500b0abcb60d78c44a27ca9906009b1826bc7a75f618b031ac397b45f008",
-                    "mixHash" : "0xa406e0b273787c468f42e356724abb16360529eb32d105cd30c6f4c7ff32ddef",
-                    "nonce" : "0xdcae88f028589d5c",
+                    "hash" : "0x2d8f133f636ea40061e8fa25d1180b006e1793d5f286090c9b25dc3627c33507",
+                    "mixHash" : "0x4e6a8071258399b6ec9fb05503b0058ef25c9f043e33102a45c15827ce7b6746",
+                    "nonce" : "0xf51a2579cb3b759b",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x9aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5d",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xf385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dfc8dd248265e6285acd9507cc17015162feb31231630d7253be11258979d885a0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa09aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a0a406e0b273787c468f42e356724abb16360529eb32d105cd30c6f4c7ff32ddef88dcae88f028589d5cf8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dfc8dd248265e6285acd9507cc17015162feb31231630d7253be11258979d885a0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa09aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a04e6a8071258399b6ec9fb05503b0058ef25c9f043e33102a45c15827ce7b674688f51a2579cb3b759bf8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e0d500b0abcb60d78c44a27ca9906009b1826bc7a75f618b031ac397b45f008",
+        "lastblockhash" : "0x2d8f133f636ea40061e8fa25d1180b006e1793d5f286090c9b25dc3627c33507",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d30g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g0v0Filler.json",
             "sourceHash" : "65ceecd76b7c180a3c9399c9f8bc4f517fe95735d8c9272a4fb9b1e70d7215f5"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb8c4",
-                    "hash" : "0xcb34b77577edb548c594bc650ecbc35cbdee2ea4d44db9615e0db8613c093fde",
-                    "mixHash" : "0x19ccca3728906863b642e0798a3050a7b9d9edfb249b5e86bd8126782657aaf4",
-                    "nonce" : "0x81b7b343e64e1d96",
+                    "hash" : "0xc2fd346bd89f8be6399e4410921ae2745ac43e97f0482e7cf59eaeb39dbb5636",
+                    "mixHash" : "0x81f8d8cf7a6fdde6fe9e370523b578b0b3f42c77e90d47a3af474a5b678353db",
+                    "nonce" : "0x804e102447155105",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x4abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0xf385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a019ccca3728906863b642e0798a3050a7b9d9edfb249b5e86bd8126782657aaf48881b7b343e64e1d96f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a081f8d8cf7a6fdde6fe9e370523b578b0b3f42c77e90d47a3af474a5b678353db88804e102447155105f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb34b77577edb548c594bc650ecbc35cbdee2ea4d44db9615e0db8613c093fde",
+        "lastblockhash" : "0xc2fd346bd89f8be6399e4410921ae2745ac43e97f0482e7cf59eaeb39dbb5636",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d30g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g0v0Filler.json",
             "sourceHash" : "65ceecd76b7c180a3c9399c9f8bc4f517fe95735d8c9272a4fb9b1e70d7215f5"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb8c4",
-                    "hash" : "0x518b979cd405c76b531feefb9a2964c283d99f4b0761f47a1fbf90a9ab975a97",
-                    "mixHash" : "0x0d4536bb8ad9580eac2efb50f0d99bafde99d074e1bc09fa14667f0626aac01a",
-                    "nonce" : "0xf6f11006c7f558ed",
+                    "hash" : "0x086bdcde4f56a20eeb1748b672cadad3eab575f21b56001bb06b898791380253",
+                    "mixHash" : "0x8c0b4857e846f5439c51a5f557c86f3b9c9632e8d0819aca8fbd9e720c383cc4",
+                    "nonce" : "0x23730a8d373339ea",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x4abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0xf385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a00d4536bb8ad9580eac2efb50f0d99bafde99d074e1bc09fa14667f0626aac01a88f6f11006c7f558edf8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a08c0b4857e846f5439c51a5f557c86f3b9c9632e8d0819aca8fbd9e720c383cc48823730a8d373339eaf8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x518b979cd405c76b531feefb9a2964c283d99f4b0761f47a1fbf90a9ab975a97",
+        "lastblockhash" : "0x086bdcde4f56a20eeb1748b672cadad3eab575f21b56001bb06b898791380253",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g1v0.json
index 7a73a41bf..d3b4c5d78 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d30g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g1v0Filler.json",
+            "sourceHash" : "e160235ff4386326e19cebf3ec7e5c75f7af8c860a9ee1d200d25a2cbf2026f5"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb8c4",
+                    "hash" : "0xb6ec27b97d485894f94d6808c773c794087e60c9ef57de81f29921711ff44bd9",
+                    "mixHash" : "0x71e16e7b4901793fba0d6cb861a80f4d8a29e8b406fe84f5933d16c39a915d69",
+                    "nonce" : "0x29234426f643b029",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5d",
+                    "stateRoot" : "0xdfc8dd248265e6285acd9507cc17015162feb31231630d7253be11258979d885",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe92b9fa316d34fd3c246e5b84c51dfea56383fd609b33e141361a1f5fdeec4a7",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dfc8dd248265e6285acd9507cc17015162feb31231630d7253be11258979d885a0e92b9fa316d34fd3c246e5b84c51dfea56383fd609b33e141361a1f5fdeec4a7a09aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a071e16e7b4901793fba0d6cb861a80f4d8a29e8b406fe84f5933d16c39a915d698829234426f643b029f8c3f8c1800183015f9094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca09d989fd595d32b25f94519ce65ba7552857dafde284e5e8fb4c231bbe1f02568a0371621510cff37f282f923f3ba63e60c8460159e8f715bb2212c8ad9d9d457a5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d989fd595d32b25f94519ce65ba7552857dafde284e5e8fb4c231bbe1f02568",
+                        "s" : "0x371621510cff37f282f923f3ba63e60c8460159e8f715bb2212c8ad9d9d457a5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb6ec27b97d485894f94d6808c773c794087e60c9ef57de81f29921711ff44bd9",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb8c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f473c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d30g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g1v0Filler.json",
+            "sourceHash" : "e160235ff4386326e19cebf3ec7e5c75f7af8c860a9ee1d200d25a2cbf2026f5"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb8c4",
+                    "hash" : "0x14c7016c7eca609cd6208cc5fb615ff078299f0ed9fd376685b64c5e7dcd41ac",
+                    "mixHash" : "0x177093383641ea944173fc792ca1a8119c1689547a86020156c8a93b1e184239",
+                    "nonce" : "0xd9630fd75dca8f15",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38",
+                    "stateRoot" : "0x81d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe92b9fa316d34fd3c246e5b84c51dfea56383fd609b33e141361a1f5fdeec4a7",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a0e92b9fa316d34fd3c246e5b84c51dfea56383fd609b33e141361a1f5fdeec4a7a04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a0177093383641ea944173fc792ca1a8119c1689547a86020156c8a93b1e18423988d9630fd75dca8f15f8c3f8c1800183015f9094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca09d989fd595d32b25f94519ce65ba7552857dafde284e5e8fb4c231bbe1f02568a0371621510cff37f282f923f3ba63e60c8460159e8f715bb2212c8ad9d9d457a5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d989fd595d32b25f94519ce65ba7552857dafde284e5e8fb4c231bbe1f02568",
+                        "s" : "0x371621510cff37f282f923f3ba63e60c8460159e8f715bb2212c8ad9d9d457a5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x14c7016c7eca609cd6208cc5fb615ff078299f0ed9fd376685b64c5e7dcd41ac",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b8c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f473c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d30g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g1v0Filler.json",
+            "sourceHash" : "e160235ff4386326e19cebf3ec7e5c75f7af8c860a9ee1d200d25a2cbf2026f5"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb8c4",
+                    "hash" : "0xf88febd3d026530418aff9e8bb146a96d9fa5c05c78e89ee060976adc0fd7d77",
+                    "mixHash" : "0x267bf60a2a3623aadc501e6e9d70c63508473e76f2bfd2ce1ec57063418a89fe",
+                    "nonce" : "0xc999927eb9a7ed97",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38",
+                    "stateRoot" : "0x81d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe92b9fa316d34fd3c246e5b84c51dfea56383fd609b33e141361a1f5fdeec4a7",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a0e92b9fa316d34fd3c246e5b84c51dfea56383fd609b33e141361a1f5fdeec4a7a04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a0267bf60a2a3623aadc501e6e9d70c63508473e76f2bfd2ce1ec57063418a89fe88c999927eb9a7ed97f8c3f8c1800183015f9094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca09d989fd595d32b25f94519ce65ba7552857dafde284e5e8fb4c231bbe1f02568a0371621510cff37f282f923f3ba63e60c8460159e8f715bb2212c8ad9d9d457a5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d989fd595d32b25f94519ce65ba7552857dafde284e5e8fb4c231bbe1f02568",
+                        "s" : "0x371621510cff37f282f923f3ba63e60c8460159e8f715bb2212c8ad9d9d457a5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf88febd3d026530418aff9e8bb146a96d9fa5c05c78e89ee060976adc0fd7d77",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b8c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f473c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g2v0.json
index 7a73a41bf..d04a3f1f8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d30g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g2v0Filler.json",
+            "sourceHash" : "6f771919267069a1dd4f33b32dce7a7132eb66d9bd28ad0cc034a8e2b7e7d154"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb8c4",
+                    "hash" : "0xe245419c54f2b0e9e158df3174458bad9fb701f888819bb695d1b829ab80ac71",
+                    "mixHash" : "0x9346f95fd0496dfe35b6d2e6420c072c08a6fbee734937ecfbf1d852ca0a48b2",
+                    "nonce" : "0xe9fa08741ce548a2",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5d",
+                    "stateRoot" : "0xdfc8dd248265e6285acd9507cc17015162feb31231630d7253be11258979d885",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6ad4463ae474345968300d03c1ecdf5335300b4298f70062d18191dac180edbf",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dfc8dd248265e6285acd9507cc17015162feb31231630d7253be11258979d885a06ad4463ae474345968300d03c1ecdf5335300b4298f70062d18191dac180edbfa09aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a09346f95fd0496dfe35b6d2e6420c072c08a6fbee734937ecfbf1d852ca0a48b288e9fa08741ce548a2f8c3f8c180018301adb094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0b6e10e358b8360e09f11af87e1108a1a27f95a8b796c2266dd0ce10300509213a01bc89ef6f5875d544f89085f8a72fda6f180fd18c20b14209b6b782f0170d96bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6e10e358b8360e09f11af87e1108a1a27f95a8b796c2266dd0ce10300509213",
+                        "s" : "0x1bc89ef6f5875d544f89085f8a72fda6f180fd18c20b14209b6b782f0170d96b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe245419c54f2b0e9e158df3174458bad9fb701f888819bb695d1b829ab80ac71",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb8c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f473c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d30g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g2v0Filler.json",
+            "sourceHash" : "6f771919267069a1dd4f33b32dce7a7132eb66d9bd28ad0cc034a8e2b7e7d154"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb8c4",
+                    "hash" : "0xa79bac207196a9f6dc444e58ac98420b9d49812d20967ce3cf74350145d70057",
+                    "mixHash" : "0xdf33b5adb98e7e9ba6ec58064847166e821f00767152d0d41d26f31de1d6578b",
+                    "nonce" : "0xa9e5bfd8363089e2",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38",
+                    "stateRoot" : "0x81d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6ad4463ae474345968300d03c1ecdf5335300b4298f70062d18191dac180edbf",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a06ad4463ae474345968300d03c1ecdf5335300b4298f70062d18191dac180edbfa04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a0df33b5adb98e7e9ba6ec58064847166e821f00767152d0d41d26f31de1d6578b88a9e5bfd8363089e2f8c3f8c180018301adb094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0b6e10e358b8360e09f11af87e1108a1a27f95a8b796c2266dd0ce10300509213a01bc89ef6f5875d544f89085f8a72fda6f180fd18c20b14209b6b782f0170d96bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6e10e358b8360e09f11af87e1108a1a27f95a8b796c2266dd0ce10300509213",
+                        "s" : "0x1bc89ef6f5875d544f89085f8a72fda6f180fd18c20b14209b6b782f0170d96b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa79bac207196a9f6dc444e58ac98420b9d49812d20967ce3cf74350145d70057",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b8c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f473c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d30g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g2v0Filler.json",
+            "sourceHash" : "6f771919267069a1dd4f33b32dce7a7132eb66d9bd28ad0cc034a8e2b7e7d154"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb8c4",
+                    "hash" : "0xc93d13c37782955b04f47694b7b34bcf5e922a95880fd9e5b851be5266bd9a07",
+                    "mixHash" : "0xbfb397ef27020c5d7628a1d2addaf3d395a6c954014b299dc158c3ac48b89ab5",
+                    "nonce" : "0x518ee39147980342",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38",
+                    "stateRoot" : "0x81d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6ad4463ae474345968300d03c1ecdf5335300b4298f70062d18191dac180edbf",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a06ad4463ae474345968300d03c1ecdf5335300b4298f70062d18191dac180edbfa04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a0bfb397ef27020c5d7628a1d2addaf3d395a6c954014b299dc158c3ac48b89ab588518ee39147980342f8c3f8c180018301adb094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0b6e10e358b8360e09f11af87e1108a1a27f95a8b796c2266dd0ce10300509213a01bc89ef6f5875d544f89085f8a72fda6f180fd18c20b14209b6b782f0170d96bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6e10e358b8360e09f11af87e1108a1a27f95a8b796c2266dd0ce10300509213",
+                        "s" : "0x1bc89ef6f5875d544f89085f8a72fda6f180fd18c20b14209b6b782f0170d96b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc93d13c37782955b04f47694b7b34bcf5e922a95880fd9e5b851be5266bd9a07",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b8c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f473c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g3v0.json
index 7a73a41bf..7212001af 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d30g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g3v0Filler.json",
+            "sourceHash" : "7a95c65e108be826c081701306de36054963110cf4d7cf6da09a90a5823149b3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb8c4",
+                    "hash" : "0xd7562a8da600d481170816777cd36fed32c0ab80d23e2d2816e228f33072e806",
+                    "mixHash" : "0x6da2255cd5e27d02977b4b2b7f78960f78bc8349017fb862d2b8568b80b293f1",
+                    "nonce" : "0x11667ef66f8801d6",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5d",
+                    "stateRoot" : "0xdfc8dd248265e6285acd9507cc17015162feb31231630d7253be11258979d885",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7fe75daf49a34f6d100757083ceead5baa07b0eda2bce05f319206ffd88bf60c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dfc8dd248265e6285acd9507cc17015162feb31231630d7253be11258979d885a07fe75daf49a34f6d100757083ceead5baa07b0eda2bce05f319206ffd88bf60ca09aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a06da2255cd5e27d02977b4b2b7f78960f78bc8349017fb862d2b8568b80b293f18811667ef66f8801d6f8c3f8c1800183030d4094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba05a472bb8260760053e5b6e6b6037695d5087cc5082abe02d7974b90daf9c5216a0412a22483f66c69586e32efaa0b46518df39a35f66a665d987f7216f1014b6e5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a472bb8260760053e5b6e6b6037695d5087cc5082abe02d7974b90daf9c5216",
+                        "s" : "0x412a22483f66c69586e32efaa0b46518df39a35f66a665d987f7216f1014b6e5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd7562a8da600d481170816777cd36fed32c0ab80d23e2d2816e228f33072e806",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb8c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f473c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d30g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g3v0Filler.json",
+            "sourceHash" : "7a95c65e108be826c081701306de36054963110cf4d7cf6da09a90a5823149b3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb8c4",
+                    "hash" : "0xa0b64aee3a6ab31de636ae310ab595547de91203ca10939c17ef5cd2f6f4b9ec",
+                    "mixHash" : "0xe5749116ee9a0e5d8e2ac0f2cbfa172760f44bf1d94f9b56275a1975bc0b0f08",
+                    "nonce" : "0x895c527c005c2b9d",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38",
+                    "stateRoot" : "0x81d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7fe75daf49a34f6d100757083ceead5baa07b0eda2bce05f319206ffd88bf60c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a07fe75daf49a34f6d100757083ceead5baa07b0eda2bce05f319206ffd88bf60ca04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a0e5749116ee9a0e5d8e2ac0f2cbfa172760f44bf1d94f9b56275a1975bc0b0f0888895c527c005c2b9df8c3f8c1800183030d4094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba05a472bb8260760053e5b6e6b6037695d5087cc5082abe02d7974b90daf9c5216a0412a22483f66c69586e32efaa0b46518df39a35f66a665d987f7216f1014b6e5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a472bb8260760053e5b6e6b6037695d5087cc5082abe02d7974b90daf9c5216",
+                        "s" : "0x412a22483f66c69586e32efaa0b46518df39a35f66a665d987f7216f1014b6e5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa0b64aee3a6ab31de636ae310ab595547de91203ca10939c17ef5cd2f6f4b9ec",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b8c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f473c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d30g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g3v0Filler.json",
+            "sourceHash" : "7a95c65e108be826c081701306de36054963110cf4d7cf6da09a90a5823149b3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb8c4",
+                    "hash" : "0x5acfd2b91e43501b32670637bfcbf778242e66dd361cc6a4e7d7fd4a8152896d",
+                    "mixHash" : "0xa7a769e3d5da482a0fe10aa9da15c809b379cbcab38cf4525843acd42284bad5",
+                    "nonce" : "0x42af213fc11b3ac6",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38",
+                    "stateRoot" : "0x81d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7fe75daf49a34f6d100757083ceead5baa07b0eda2bce05f319206ffd88bf60c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a07fe75daf49a34f6d100757083ceead5baa07b0eda2bce05f319206ffd88bf60ca04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a0a7a769e3d5da482a0fe10aa9da15c809b379cbcab38cf4525843acd42284bad58842af213fc11b3ac6f8c3f8c1800183030d4094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba05a472bb8260760053e5b6e6b6037695d5087cc5082abe02d7974b90daf9c5216a0412a22483f66c69586e32efaa0b46518df39a35f66a665d987f7216f1014b6e5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a472bb8260760053e5b6e6b6037695d5087cc5082abe02d7974b90daf9c5216",
+                        "s" : "0x412a22483f66c69586e32efaa0b46518df39a35f66a665d987f7216f1014b6e5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5acfd2b91e43501b32670637bfcbf778242e66dd361cc6a4e7d7fd4a8152896d",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b8c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f473c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g0v0.json
index 670fc67b6..79d5496f4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d31g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g0v0Filler.json",
             "sourceHash" : "33a20ff13eb72e99f4337626e85d58068f31057f686eb5f9b62b55689a90cd5d"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x011fec",
-                    "hash" : "0x5d97748156e5b008f825050e5b4fb09f4fe9a2fcb5549581102d0c5de2af20f3",
-                    "mixHash" : "0x55459e64651ae8e81539108ecc2ff969a53b49b5245b7907a17105ed7642382c",
-                    "nonce" : "0x4e7ba0ea616a40a5",
+                    "hash" : "0xe42d8704b129e5d3c15355aeaffa89412922f2342a87b33469d6e5b8a6ec8228",
+                    "mixHash" : "0x3ab7e9150e410d6c4325356c8a934afb1750cc7eddd047f7159ea9779e3252f3",
+                    "nonce" : "0x1d7d1d84d467eeda",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xba529b6b864f9020981b50fd923f9de453a87f06d367dde2e5a44c1f7cef16ac",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xbb4d9d96f54ad986ba385e677552cdb79c5080a7dad26627e45b4f6ca6a784dd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ffd5270c9524243b412347859a9c8180005c5d7c7453166b64ff28137a73df9a0bb4d9d96f54ad986ba385e677552cdb79c5080a7dad26627e45b4f6ca6a784dda0ba529b6b864f9020981b50fd923f9de453a87f06d367dde2e5a44c1f7cef16acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083011fec8203e880a055459e64651ae8e81539108ecc2ff969a53b49b5245b7907a17105ed7642382c884e7ba0ea616a40a5f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca0c7722626b8e7a1157ac5b6aabdd2eedaa9bc61f3bcac625f63723f40d5e075aaa078452359e76003c2c1adc0ef9cf7fabdafd642e737377b36cf222936606d1899c0",
+                "rlp" : "0xf90307f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ffd5270c9524243b412347859a9c8180005c5d7c7453166b64ff28137a73df9a0bb4d9d96f54ad986ba385e677552cdb79c5080a7dad26627e45b4f6ca6a784dda0ba529b6b864f9020981b50fd923f9de453a87f06d367dde2e5a44c1f7cef16acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083011fec8203e880a03ab7e9150e410d6c4325356c8a934afb1750cc7eddd047f7159ea9779e3252f3881d7d1d84d467eedaf90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca0c7722626b8e7a1157ac5b6aabdd2eedaa9bc61f3bcac625f63723f40d5e075aaa078452359e76003c2c1adc0ef9cf7fabdafd642e737377b36cf222936606d1899c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d97748156e5b008f825050e5b4fb09f4fe9a2fcb5549581102d0c5de2af20f3",
+        "lastblockhash" : "0xe42d8704b129e5d3c15355aeaffa89412922f2342a87b33469d6e5b8a6ec8228",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d31g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g0v0Filler.json",
             "sourceHash" : "33a20ff13eb72e99f4337626e85d58068f31057f686eb5f9b62b55689a90cd5d"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xca51",
-                    "hash" : "0x6eed0daa5835e2aef065d869a956179e2af36921137756bf8cc056de4defdb77",
-                    "mixHash" : "0xe585d690b44d8c17991b8ce3086c5ddf75b0fb5ca697dabd1b550194b4a8b838",
-                    "nonce" : "0x420d7255ea5fb5af",
+                    "hash" : "0x2b18a8090b69053bfd147069cd7c34310896c9c7df7763ac2b34086510e0abc1",
+                    "mixHash" : "0x5369519f02554f2889ec50d1718209bd557e9daec6055240202bba64142a7cd0",
+                    "nonce" : "0xbed07a44ffccc5ca",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xc9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabd",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0xbb4d9d96f54ad986ba385e677552cdb79c5080a7dad26627e45b4f6ca6a784dd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405a0bb4d9d96f54ad986ba385e677552cdb79c5080a7dad26627e45b4f6ca6a784dda0c9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca518203e880a0e585d690b44d8c17991b8ce3086c5ddf75b0fb5ca697dabd1b550194b4a8b83888420d7255ea5fb5aff90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca0c7722626b8e7a1157ac5b6aabdd2eedaa9bc61f3bcac625f63723f40d5e075aaa078452359e76003c2c1adc0ef9cf7fabdafd642e737377b36cf222936606d1899c0",
+                "rlp" : "0xf90306f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405a0bb4d9d96f54ad986ba385e677552cdb79c5080a7dad26627e45b4f6ca6a784dda0c9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca518203e880a05369519f02554f2889ec50d1718209bd557e9daec6055240202bba64142a7cd088bed07a44ffccc5caf90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca0c7722626b8e7a1157ac5b6aabdd2eedaa9bc61f3bcac625f63723f40d5e075aaa078452359e76003c2c1adc0ef9cf7fabdafd642e737377b36cf222936606d1899c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6eed0daa5835e2aef065d869a956179e2af36921137756bf8cc056de4defdb77",
+        "lastblockhash" : "0x2b18a8090b69053bfd147069cd7c34310896c9c7df7763ac2b34086510e0abc1",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d31g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g0v0Filler.json",
             "sourceHash" : "33a20ff13eb72e99f4337626e85d58068f31057f686eb5f9b62b55689a90cd5d"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xca51",
-                    "hash" : "0xfdbf69cbf4f228c53556f25cb3fbb3cddebdd5455210192eefc82bce4231c438",
-                    "mixHash" : "0x4f1e3b7463e9fb8e640d385002bcff6ea7ef5199e72d28161e05763a5bd63a98",
-                    "nonce" : "0x67f2fc0f203cb56e",
+                    "hash" : "0x4c30f9bf4dc7d27b7906b7b29321fa2231ec9422299ba28da37dddc39a41e91e",
+                    "mixHash" : "0x6051245b0a4464aabc9fc39319800c2adb5bd87b0345e8b5d1721b4975acd5f6",
+                    "nonce" : "0x7e09f1d94de8d728",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xc9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabd",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0xbb4d9d96f54ad986ba385e677552cdb79c5080a7dad26627e45b4f6ca6a784dd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405a0bb4d9d96f54ad986ba385e677552cdb79c5080a7dad26627e45b4f6ca6a784dda0c9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca518203e880a04f1e3b7463e9fb8e640d385002bcff6ea7ef5199e72d28161e05763a5bd63a988867f2fc0f203cb56ef90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca0c7722626b8e7a1157ac5b6aabdd2eedaa9bc61f3bcac625f63723f40d5e075aaa078452359e76003c2c1adc0ef9cf7fabdafd642e737377b36cf222936606d1899c0",
+                "rlp" : "0xf90306f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405a0bb4d9d96f54ad986ba385e677552cdb79c5080a7dad26627e45b4f6ca6a784dda0c9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca518203e880a06051245b0a4464aabc9fc39319800c2adb5bd87b0345e8b5d1721b4975acd5f6887e09f1d94de8d728f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca0c7722626b8e7a1157ac5b6aabdd2eedaa9bc61f3bcac625f63723f40d5e075aaa078452359e76003c2c1adc0ef9cf7fabdafd642e737377b36cf222936606d1899c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfdbf69cbf4f228c53556f25cb3fbb3cddebdd5455210192eefc82bce4231c438",
+        "lastblockhash" : "0x4c30f9bf4dc7d27b7906b7b29321fa2231ec9422299ba28da37dddc39a41e91e",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g1v0.json
index c59ac26e0..0218d6222 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g1v0.json
@@ -2,10 +2,10 @@
     "modexp_d31g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g1v0Filler.json",
-            "sourceHash" : "9f8b6475e3921496385185ab6866fce3bc02a5dbaed1d2c98c4da11f7ed4e06f"
+            "sourceHash" : "10a80c41b93e00a78f0272be98ac6cd5ecfca3a5fd133fe7dee46d25c477d193"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x011fec",
-                    "hash" : "0x60fef1658df77156cc0b4ea91fac7ccf36ce2593dca6d980a259eaa2598beef7",
-                    "mixHash" : "0x9acf0346a845db4b4d171fc0f16ed0250276f6d534e3821fe9db021bd340b6b2",
-                    "nonce" : "0x7e85367c175afb81",
+                    "hash" : "0x20b071c0f6bbdf2a5822f334ee2317e058a2bf22b29014a7f0308f2d51a2bac4",
+                    "mixHash" : "0xad17891c1da62820af1ab5edfa5c317bbb8b17b4bbd2051c025f91c4ab687107",
+                    "nonce" : "0xbfcc595cb0799bd8",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xba529b6b864f9020981b50fd923f9de453a87f06d367dde2e5a44c1f7cef16ac",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x4ae0add409869066e03177eb2f6e67af8710ab837a81be6403fb4e32aa4573eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ffd5270c9524243b412347859a9c8180005c5d7c7453166b64ff28137a73df9a04ae0add409869066e03177eb2f6e67af8710ab837a81be6403fb4e32aa4573eba0ba529b6b864f9020981b50fd923f9de453a87f06d367dde2e5a44c1f7cef16acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083011fec8203e880a09acf0346a845db4b4d171fc0f16ed0250276f6d534e3821fe9db021bd340b6b2887e85367c175afb81f90105f90102800183015f9094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca065ef99a64b32ceab03052d483d3dbe82410bb4fbae455fed6cd040aa3ff6bdeba07f043ab099cb17b5a639b26f5ad8b5fdbed8b929ec14c5612617eb6046f96b3cc0",
+                "rlp" : "0xf90306f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ffd5270c9524243b412347859a9c8180005c5d7c7453166b64ff28137a73df9a04ae0add409869066e03177eb2f6e67af8710ab837a81be6403fb4e32aa4573eba0ba529b6b864f9020981b50fd923f9de453a87f06d367dde2e5a44c1f7cef16acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083011fec8203e880a0ad17891c1da62820af1ab5edfa5c317bbb8b17b4bbd2051c025f91c4ab68710788bfcc595cb0799bd8f90105f90102800183015f9094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca065ef99a64b32ceab03052d483d3dbe82410bb4fbae455fed6cd040aa3ff6bdeba07f043ab099cb17b5a639b26f5ad8b5fdbed8b929ec14c5612617eb6046f96b3cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x60fef1658df77156cc0b4ea91fac7ccf36ce2593dca6d980a259eaa2598beef7",
+        "lastblockhash" : "0x20b071c0f6bbdf2a5822f334ee2317e058a2bf22b29014a7f0308f2d51a2bac4",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d31g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g1v0Filler.json",
+            "sourceHash" : "10a80c41b93e00a78f0272be98ac6cd5ecfca3a5fd133fe7dee46d25c477d193"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca51",
+                    "hash" : "0x2a448782b1fc31f04f90c5d1ff2779f89e6e17e19cd20cc60a89cc31e989156f",
+                    "mixHash" : "0xccd3c2ab7dd050c4dde709eed5e8bc48d4777ebf318b0bb8ab05dd053a91adf9",
+                    "nonce" : "0x5d6f331bc1b04d81",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabd",
+                    "stateRoot" : "0xa3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4ae0add409869066e03177eb2f6e67af8710ab837a81be6403fb4e32aa4573eb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405a04ae0add409869066e03177eb2f6e67af8710ab837a81be6403fb4e32aa4573eba0c9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca518203e880a0ccd3c2ab7dd050c4dde709eed5e8bc48d4777ebf318b0bb8ab05dd053a91adf9885d6f331bc1b04d81f90105f90102800183015f9094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca065ef99a64b32ceab03052d483d3dbe82410bb4fbae455fed6cd040aa3ff6bdeba07f043ab099cb17b5a639b26f5ad8b5fdbed8b929ec14c5612617eb6046f96b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65ef99a64b32ceab03052d483d3dbe82410bb4fbae455fed6cd040aa3ff6bdeb",
+                        "s" : "0x7f043ab099cb17b5a639b26f5ad8b5fdbed8b929ec14c5612617eb6046f96b3c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2a448782b1fc31f04f90c5d1ff2779f89e6e17e19cd20cc60a89cc31e989156f",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca51",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f35af",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d31g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g1v0Filler.json",
+            "sourceHash" : "10a80c41b93e00a78f0272be98ac6cd5ecfca3a5fd133fe7dee46d25c477d193"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca51",
+                    "hash" : "0x6ce224d7455227983e12263f5c3a735692974afab9da1826f7dc8a1b2a620947",
+                    "mixHash" : "0xd78e93937dc85cc969aae2e958cdddcb1af8b4003d42fed494a3249f8328d1be",
+                    "nonce" : "0xf26b9424aae79be1",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabd",
+                    "stateRoot" : "0xa3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4ae0add409869066e03177eb2f6e67af8710ab837a81be6403fb4e32aa4573eb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405a04ae0add409869066e03177eb2f6e67af8710ab837a81be6403fb4e32aa4573eba0c9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca518203e880a0d78e93937dc85cc969aae2e958cdddcb1af8b4003d42fed494a3249f8328d1be88f26b9424aae79be1f90105f90102800183015f9094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca065ef99a64b32ceab03052d483d3dbe82410bb4fbae455fed6cd040aa3ff6bdeba07f043ab099cb17b5a639b26f5ad8b5fdbed8b929ec14c5612617eb6046f96b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65ef99a64b32ceab03052d483d3dbe82410bb4fbae455fed6cd040aa3ff6bdeb",
+                        "s" : "0x7f043ab099cb17b5a639b26f5ad8b5fdbed8b929ec14c5612617eb6046f96b3c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6ce224d7455227983e12263f5c3a735692974afab9da1826f7dc8a1b2a620947",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca51",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f35af",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g2v0.json
index d77e9b826..99ce3339d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g2v0.json
@@ -2,10 +2,10 @@
     "modexp_d31g2v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g2v0Filler.json",
-            "sourceHash" : "c6009fa5c78bb8d45b639bf52fd23e72a09f2764ee456ce0f641a3b4978ec7c5"
+            "sourceHash" : "072c4342308900058338b9b6d54db8dc11c5a353499f8b5a93f1cbcbb822d75c"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x011fec",
-                    "hash" : "0x6552ae29da943f5ef4a769a90936c163f41a94ee25952d22f20bbcaadde98423",
-                    "mixHash" : "0x11f82a5ba181b231045b9ed6a2290e2cc4af83757d5d2b1e7fdf4712af57e32a",
-                    "nonce" : "0x3d77da254fd28a40",
+                    "hash" : "0x17e6952c186e063392e07de0ba644ae3a09d0994f4248222a143925812fbed13",
+                    "mixHash" : "0x3d858f8b314257fe0f7d79b9506c67209096012023de7c6041545359e00e8db7",
+                    "nonce" : "0xdf44d51e0ee8aa77",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xba529b6b864f9020981b50fd923f9de453a87f06d367dde2e5a44c1f7cef16ac",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xf94d60805a84b3af58f904fe8934d4d0f095bf1b40ee568e4244dcba863e8095",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ffd5270c9524243b412347859a9c8180005c5d7c7453166b64ff28137a73df9a0f94d60805a84b3af58f904fe8934d4d0f095bf1b40ee568e4244dcba863e8095a0ba529b6b864f9020981b50fd923f9de453a87f06d367dde2e5a44c1f7cef16acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083011fec8203e880a011f82a5ba181b231045b9ed6a2290e2cc4af83757d5d2b1e7fdf4712af57e32a883d77da254fd28a40f90105f9010280018301adb094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ba0abee802cbfa062e465d7f4467b062a7a430517b33b0b09394f5fb9035723831fa07cd62c3aa88b1b6034fe924e7ca318e9d3381e23ff5a2f081e643ce0b83abbccc0",
+                "rlp" : "0xf90306f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ffd5270c9524243b412347859a9c8180005c5d7c7453166b64ff28137a73df9a0f94d60805a84b3af58f904fe8934d4d0f095bf1b40ee568e4244dcba863e8095a0ba529b6b864f9020981b50fd923f9de453a87f06d367dde2e5a44c1f7cef16acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083011fec8203e880a03d858f8b314257fe0f7d79b9506c67209096012023de7c6041545359e00e8db788df44d51e0ee8aa77f90105f9010280018301adb094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ba0abee802cbfa062e465d7f4467b062a7a430517b33b0b09394f5fb9035723831fa07cd62c3aa88b1b6034fe924e7ca318e9d3381e23ff5a2f081e643ce0b83abbccc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6552ae29da943f5ef4a769a90936c163f41a94ee25952d22f20bbcaadde98423",
+        "lastblockhash" : "0x17e6952c186e063392e07de0ba644ae3a09d0994f4248222a143925812fbed13",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d31g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g2v0Filler.json",
+            "sourceHash" : "072c4342308900058338b9b6d54db8dc11c5a353499f8b5a93f1cbcbb822d75c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca51",
+                    "hash" : "0x165aa09fa7cb9194774d4dc97156eeeb0fcd832c944b5a617b28e25db256ece1",
+                    "mixHash" : "0x8ce494b76c6ec11db335a09a6bb1715b70ea96866047386f03933483e044d363",
+                    "nonce" : "0xa894d16a724f0f38",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabd",
+                    "stateRoot" : "0xa3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf94d60805a84b3af58f904fe8934d4d0f095bf1b40ee568e4244dcba863e8095",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405a0f94d60805a84b3af58f904fe8934d4d0f095bf1b40ee568e4244dcba863e8095a0c9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca518203e880a08ce494b76c6ec11db335a09a6bb1715b70ea96866047386f03933483e044d36388a894d16a724f0f38f90105f9010280018301adb094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ba0abee802cbfa062e465d7f4467b062a7a430517b33b0b09394f5fb9035723831fa07cd62c3aa88b1b6034fe924e7ca318e9d3381e23ff5a2f081e643ce0b83abbccc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xabee802cbfa062e465d7f4467b062a7a430517b33b0b09394f5fb9035723831f",
+                        "s" : "0x7cd62c3aa88b1b6034fe924e7ca318e9d3381e23ff5a2f081e643ce0b83abbcc",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x165aa09fa7cb9194774d4dc97156eeeb0fcd832c944b5a617b28e25db256ece1",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca51",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f35af",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d31g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g2v0Filler.json",
+            "sourceHash" : "072c4342308900058338b9b6d54db8dc11c5a353499f8b5a93f1cbcbb822d75c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca51",
+                    "hash" : "0xd82a8ea53700d5b4a5fd4aa40197924793b334277da011aa9f3fc42231f1fb4d",
+                    "mixHash" : "0xdd9f7d13276e2f5b4fd63f3502e4b0b6f1025400257087a2ad3b8aa566f8cd74",
+                    "nonce" : "0x95705ce861a57b9c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabd",
+                    "stateRoot" : "0xa3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf94d60805a84b3af58f904fe8934d4d0f095bf1b40ee568e4244dcba863e8095",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405a0f94d60805a84b3af58f904fe8934d4d0f095bf1b40ee568e4244dcba863e8095a0c9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca518203e880a0dd9f7d13276e2f5b4fd63f3502e4b0b6f1025400257087a2ad3b8aa566f8cd748895705ce861a57b9cf90105f9010280018301adb094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ba0abee802cbfa062e465d7f4467b062a7a430517b33b0b09394f5fb9035723831fa07cd62c3aa88b1b6034fe924e7ca318e9d3381e23ff5a2f081e643ce0b83abbccc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xabee802cbfa062e465d7f4467b062a7a430517b33b0b09394f5fb9035723831f",
+                        "s" : "0x7cd62c3aa88b1b6034fe924e7ca318e9d3381e23ff5a2f081e643ce0b83abbcc",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd82a8ea53700d5b4a5fd4aa40197924793b334277da011aa9f3fc42231f1fb4d",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca51",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f35af",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g3v0.json
index 68d3a60dc..54bd9dddb 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d31g3v0.json
@@ -2,10 +2,10 @@
     "modexp_d31g3v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g3v0Filler.json",
-            "sourceHash" : "eff29bbb685085f4d858aa755e4df1b3fefa2d76c2085ade06769e5be00741a2"
+            "sourceHash" : "fa845552313f76f07f623ac5b7fe7bef106ee9e2a74806feb0e0759c251da4ac"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x011fec",
-                    "hash" : "0x123ad3c9dbca0c428341c218d5d43aae3de7fec338f1b173156766915f8fe561",
-                    "mixHash" : "0x7b86028c5c1c3322f28bda0bdec30f3fd86ccad61269b8d4911a1576e07be344",
-                    "nonce" : "0xb57373e75edd0f43",
+                    "hash" : "0x6c3d16464b5a639bf5014dc5a172961146f3137bab6b275f3276748e4ddc6fc3",
+                    "mixHash" : "0x789b9ee9e78cee574ef4df773443c37b2d13808e542d10df6a469dde8d62d6e3",
+                    "nonce" : "0xb2eb41f52d5ae4b6",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xba529b6b864f9020981b50fd923f9de453a87f06d367dde2e5a44c1f7cef16ac",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xd4a89c4206f0cb691192d7ffda9db569907f81e4992986f8b72613f9f5b984ff",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ffd5270c9524243b412347859a9c8180005c5d7c7453166b64ff28137a73df9a0d4a89c4206f0cb691192d7ffda9db569907f81e4992986f8b72613f9f5b984ffa0ba529b6b864f9020981b50fd923f9de453a87f06d367dde2e5a44c1f7cef16acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083011fec8203e880a07b86028c5c1c3322f28bda0bdec30f3fd86ccad61269b8d4911a1576e07be34488b57373e75edd0f43f90105f90102800183030d4094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca042012c64148500d5c5b62148163b65e295713686ce0de740b002bbcdb3834608a071e6e12dc164d1acf5a6f8efb0d3457086a8a9e0f44ec7bac9b5753f81361b54c0",
+                "rlp" : "0xf90306f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ffd5270c9524243b412347859a9c8180005c5d7c7453166b64ff28137a73df9a0d4a89c4206f0cb691192d7ffda9db569907f81e4992986f8b72613f9f5b984ffa0ba529b6b864f9020981b50fd923f9de453a87f06d367dde2e5a44c1f7cef16acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083011fec8203e880a0789b9ee9e78cee574ef4df773443c37b2d13808e542d10df6a469dde8d62d6e388b2eb41f52d5ae4b6f90105f90102800183030d4094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca042012c64148500d5c5b62148163b65e295713686ce0de740b002bbcdb3834608a071e6e12dc164d1acf5a6f8efb0d3457086a8a9e0f44ec7bac9b5753f81361b54c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x123ad3c9dbca0c428341c218d5d43aae3de7fec338f1b173156766915f8fe561",
+        "lastblockhash" : "0x6c3d16464b5a639bf5014dc5a172961146f3137bab6b275f3276748e4ddc6fc3",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d31g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g3v0Filler.json",
+            "sourceHash" : "fa845552313f76f07f623ac5b7fe7bef106ee9e2a74806feb0e0759c251da4ac"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca51",
+                    "hash" : "0xb0146601d262988d4863e56de88258bd8a943f3a68db233963e830bf81a128e9",
+                    "mixHash" : "0x74fd7884ffc46532c7778e0757ca122dfaff80466ecc04bda3e2295525df7bd2",
+                    "nonce" : "0xf341d2a9fd0a622c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabd",
+                    "stateRoot" : "0xa3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd4a89c4206f0cb691192d7ffda9db569907f81e4992986f8b72613f9f5b984ff",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405a0d4a89c4206f0cb691192d7ffda9db569907f81e4992986f8b72613f9f5b984ffa0c9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca518203e880a074fd7884ffc46532c7778e0757ca122dfaff80466ecc04bda3e2295525df7bd288f341d2a9fd0a622cf90105f90102800183030d4094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca042012c64148500d5c5b62148163b65e295713686ce0de740b002bbcdb3834608a071e6e12dc164d1acf5a6f8efb0d3457086a8a9e0f44ec7bac9b5753f81361b54c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42012c64148500d5c5b62148163b65e295713686ce0de740b002bbcdb3834608",
+                        "s" : "0x71e6e12dc164d1acf5a6f8efb0d3457086a8a9e0f44ec7bac9b5753f81361b54",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb0146601d262988d4863e56de88258bd8a943f3a68db233963e830bf81a128e9",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca51",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f35af",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d31g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g3v0Filler.json",
+            "sourceHash" : "fa845552313f76f07f623ac5b7fe7bef106ee9e2a74806feb0e0759c251da4ac"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xca51",
+                    "hash" : "0x69441242ea6c55d1e91a9abe8bc4394eab23f4dd4dba72c7db60ad045bb46842",
+                    "mixHash" : "0xac55db8531a4ef816951e9206e32472fdaf845fa6e16cbb6478d32a907534e3a",
+                    "nonce" : "0x0e0c43c0deaea6cf",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabd",
+                    "stateRoot" : "0xa3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd4a89c4206f0cb691192d7ffda9db569907f81e4992986f8b72613f9f5b984ff",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3443c9544f535be1ac0377bd77a44b7b9f37d91d9b8e26214fa340db68e3405a0d4a89c4206f0cb691192d7ffda9db569907f81e4992986f8b72613f9f5b984ffa0c9de75ec0416876e5e089f1a4afe7f3d00bc111d14e09de0b29f20771bdfbabdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca518203e880a0ac55db8531a4ef816951e9206e32472fdaf845fa6e16cbb6478d32a907534e3a880e0c43c0deaea6cff90105f90102800183030d4094100000000000000000000000000000000000000080b8a1000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c373511ca042012c64148500d5c5b62148163b65e295713686ce0de740b002bbcdb3834608a071e6e12dc164d1acf5a6f8efb0d3457086a8a9e0f44ec7bac9b5753f81361b54c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42012c64148500d5c5b62148163b65e295713686ce0de740b002bbcdb3834608",
+                        "s" : "0x71e6e12dc164d1acf5a6f8efb0d3457086a8a9e0f44ec7bac9b5753f81361b54",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x69441242ea6c55d1e91a9abe8bc4394eab23f4dd4dba72c7db60ad045bb46842",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca51",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f35af",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g0v0.json
index b310f6913..b9ca338c5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d32g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g0v0Filler.json",
             "sourceHash" : "933ed96856bfc49616e06f97c67eb0090b0b066318aad9fc9db98401e8b88013"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xfe30",
-                    "hash" : "0x95a5fb1b5c1432f9ca1f2173918b100684430f2ad1898282d752c737b6589b84",
-                    "mixHash" : "0x253ce62c1c1106374ca87e7eb877a5124104b32a3ea1d68f464ba421158572a2",
-                    "nonce" : "0x8cad9d6549697709",
+                    "hash" : "0xba898b311132e8699df747f414c0c94ea77163357e5c71e58ee82dbb819444fe",
+                    "mixHash" : "0x098d27d31601ad64d81d7f99bd66e46311e77e9570cc97ba98cfb8d39d1fb6fa",
+                    "nonce" : "0x7130664811e27950",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x536315b2b85bfa9fe121eef8e00cdf5a5811c248dd2bc6397fc669981fabbacb",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x6dc4efdbaa0e2a431da9b3bc4252ccb2e37e7d39b6a52cfacf4692f198d87584",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e0f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa059ac20827045e64edabe59121f9018e33e4e86a51bb2496a6e4efe0a6cd5becaa06dc4efdbaa0e2a431da9b3bc4252ccb2e37e7d39b6a52cfacf4692f198d87584a0536315b2b85bfa9fe121eef8e00cdf5a5811c248dd2bc6397fc669981fabbacbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fe308203e880a0253ce62c1c1106374ca87e7eb877a5124104b32a3ea1d68f464ba421158572a2888cad9d6549697709f8e1f8df80018405f5e10094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ba01fd5930ef8e70b09322c117303baca91ceccdaedf7f16a270155f3c40d1be212a041027b3ff67166446b6eae6f8a2598665dd0eba5ed626bdf8e375bab30f8de30c0",
+                "rlp" : "0xf902e0f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa059ac20827045e64edabe59121f9018e33e4e86a51bb2496a6e4efe0a6cd5becaa06dc4efdbaa0e2a431da9b3bc4252ccb2e37e7d39b6a52cfacf4692f198d87584a0536315b2b85bfa9fe121eef8e00cdf5a5811c248dd2bc6397fc669981fabbacbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fe308203e880a0098d27d31601ad64d81d7f99bd66e46311e77e9570cc97ba98cfb8d39d1fb6fa887130664811e27950f8e1f8df80018405f5e10094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ba01fd5930ef8e70b09322c117303baca91ceccdaedf7f16a270155f3c40d1be212a041027b3ff67166446b6eae6f8a2598665dd0eba5ed626bdf8e375bab30f8de30c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95a5fb1b5c1432f9ca1f2173918b100684430f2ad1898282d752c737b6589b84",
+        "lastblockhash" : "0xba898b311132e8699df747f414c0c94ea77163357e5c71e58ee82dbb819444fe",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d32g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g0v0Filler.json",
             "sourceHash" : "933ed96856bfc49616e06f97c67eb0090b0b066318aad9fc9db98401e8b88013"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xc0fb",
-                    "hash" : "0x28ce7600be90c4ec625678a58b682a5fc87a990722d22a3487860d52cec91170",
-                    "mixHash" : "0xa736e69f87a58ffcdb07c004fb9b2eb65daab7161d62661c494f2e652d28bac0",
-                    "nonce" : "0x8f8b54f821d8ef85",
+                    "hash" : "0x889d55484c14e6752295e421629c2ec9e04d566ae0051c192e2d04b7e47dfa87",
+                    "mixHash" : "0x65d40e06ccca69a9bb2d4f0462575ad9eec93b29e26f57f282576ac6551f6bb7",
+                    "nonce" : "0xfe59cd700af44726",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0x6dc4efdbaa0e2a431da9b3bc4252ccb2e37e7d39b6a52cfacf4692f198d87584",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e0f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45a06dc4efdbaa0e2a431da9b3bc4252ccb2e37e7d39b6a52cfacf4692f198d87584a0138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c0fb8203e880a0a736e69f87a58ffcdb07c004fb9b2eb65daab7161d62661c494f2e652d28bac0888f8b54f821d8ef85f8e1f8df80018405f5e10094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ba01fd5930ef8e70b09322c117303baca91ceccdaedf7f16a270155f3c40d1be212a041027b3ff67166446b6eae6f8a2598665dd0eba5ed626bdf8e375bab30f8de30c0",
+                "rlp" : "0xf902e0f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45a06dc4efdbaa0e2a431da9b3bc4252ccb2e37e7d39b6a52cfacf4692f198d87584a0138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c0fb8203e880a065d40e06ccca69a9bb2d4f0462575ad9eec93b29e26f57f282576ac6551f6bb788fe59cd700af44726f8e1f8df80018405f5e10094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ba01fd5930ef8e70b09322c117303baca91ceccdaedf7f16a270155f3c40d1be212a041027b3ff67166446b6eae6f8a2598665dd0eba5ed626bdf8e375bab30f8de30c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28ce7600be90c4ec625678a58b682a5fc87a990722d22a3487860d52cec91170",
+        "lastblockhash" : "0x889d55484c14e6752295e421629c2ec9e04d566ae0051c192e2d04b7e47dfa87",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d32g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g0v0Filler.json",
             "sourceHash" : "933ed96856bfc49616e06f97c67eb0090b0b066318aad9fc9db98401e8b88013"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xc0fb",
-                    "hash" : "0xb86a34838061703b9cd5ef5150fa18d99780a96768bb8c21f3b35b1fe03e8e33",
-                    "mixHash" : "0xd586c5e8da35fb09bf698b3b8934ed8cd9d9bd54564e61558f816c7a4d446781",
-                    "nonce" : "0xcece0cf9b4e7ce27",
+                    "hash" : "0xfc587dfe9a5be4ff4356aed689b8d6880faa56b6f84f3d8e95e093fcf9329ef8",
+                    "mixHash" : "0x50f6e7a084dbe4d7e16636a88b172935fcd40dc74c0161bc5fd038c4060aedf8",
+                    "nonce" : "0xb3a43aded2c87c28",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0x6dc4efdbaa0e2a431da9b3bc4252ccb2e37e7d39b6a52cfacf4692f198d87584",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e0f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45a06dc4efdbaa0e2a431da9b3bc4252ccb2e37e7d39b6a52cfacf4692f198d87584a0138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c0fb8203e880a0d586c5e8da35fb09bf698b3b8934ed8cd9d9bd54564e61558f816c7a4d44678188cece0cf9b4e7ce27f8e1f8df80018405f5e10094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ba01fd5930ef8e70b09322c117303baca91ceccdaedf7f16a270155f3c40d1be212a041027b3ff67166446b6eae6f8a2598665dd0eba5ed626bdf8e375bab30f8de30c0",
+                "rlp" : "0xf902e0f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45a06dc4efdbaa0e2a431da9b3bc4252ccb2e37e7d39b6a52cfacf4692f198d87584a0138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c0fb8203e880a050f6e7a084dbe4d7e16636a88b172935fcd40dc74c0161bc5fd038c4060aedf888b3a43aded2c87c28f8e1f8df80018405f5e10094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ba01fd5930ef8e70b09322c117303baca91ceccdaedf7f16a270155f3c40d1be212a041027b3ff67166446b6eae6f8a2598665dd0eba5ed626bdf8e375bab30f8de30c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb86a34838061703b9cd5ef5150fa18d99780a96768bb8c21f3b35b1fe03e8e33",
+        "lastblockhash" : "0xfc587dfe9a5be4ff4356aed689b8d6880faa56b6f84f3d8e95e093fcf9329ef8",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g1v0.json
index 2fa8f12cb..2fed083f0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g1v0.json
@@ -2,10 +2,10 @@
     "modexp_d32g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g1v0Filler.json",
-            "sourceHash" : "4e69498feea93b01dc7fb7011d4f4d8306279adb9e7814409ed12cb08dec6692"
+            "sourceHash" : "24dc4875cea2b877ae6ead4c57f8c3f54e043700616c6535b31564c0e3a3cca3"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xfe30",
-                    "hash" : "0x71e71bc057a44fcf16cd4aca2d589f933bcfdf20391c68d91e9449510f149fd5",
-                    "mixHash" : "0x614059903ab51bce2b7af6141a0c3897d37fb1f5e4390549fee1fa8e7fb0476c",
-                    "nonce" : "0xf70ee39fdf20dd98",
+                    "hash" : "0x8b390af0387cf63677354e590653a5c5661c8ac781de86f93457bacb149fe219",
+                    "mixHash" : "0xc1b4d9d42065d795e277de796959fa73360100595c201759c710611010bbe363",
+                    "nonce" : "0x55c2615a358b6128",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x536315b2b85bfa9fe121eef8e00cdf5a5811c248dd2bc6397fc669981fabbacb",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x62b66c05137a7ba59762406db8f8fbaed866778651b1c7b788916654e5984491",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902dff901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa059ac20827045e64edabe59121f9018e33e4e86a51bb2496a6e4efe0a6cd5becaa062b66c05137a7ba59762406db8f8fbaed866778651b1c7b788916654e5984491a0536315b2b85bfa9fe121eef8e00cdf5a5811c248dd2bc6397fc669981fabbacbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fe308203e880a0614059903ab51bce2b7af6141a0c3897d37fb1f5e4390549fee1fa8e7fb0476c88f70ee39fdf20dd98f8e0f8de800183015f9094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ca04e7832772c8ce4be2d35a0f416c7a4bec0cb9658565723f2972c413fccf5484ba0668916ba9e0ec86860fd51a9903badcbd92bb99013e16c79c2f544b5e0f4d66bc0",
+                "rlp" : "0xf902dff901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa059ac20827045e64edabe59121f9018e33e4e86a51bb2496a6e4efe0a6cd5becaa062b66c05137a7ba59762406db8f8fbaed866778651b1c7b788916654e5984491a0536315b2b85bfa9fe121eef8e00cdf5a5811c248dd2bc6397fc669981fabbacbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fe308203e880a0c1b4d9d42065d795e277de796959fa73360100595c201759c710611010bbe3638855c2615a358b6128f8e0f8de800183015f9094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ca04e7832772c8ce4be2d35a0f416c7a4bec0cb9658565723f2972c413fccf5484ba0668916ba9e0ec86860fd51a9903badcbd92bb99013e16c79c2f544b5e0f4d66bc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71e71bc057a44fcf16cd4aca2d589f933bcfdf20391c68d91e9449510f149fd5",
+        "lastblockhash" : "0x8b390af0387cf63677354e590653a5c5661c8ac781de86f93457bacb149fe219",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d32g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g1v0Filler.json",
+            "sourceHash" : "24dc4875cea2b877ae6ead4c57f8c3f54e043700616c6535b31564c0e3a3cca3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc0fb",
+                    "hash" : "0x1f149baf1610f0bb88cc76a902deafbc34bb218a28196ba265e3bb470b202fd6",
+                    "mixHash" : "0x4d4f71ebffa028f5662b38f8dde4640511201954141a56f259923fd2765794b8",
+                    "nonce" : "0xcd1b27e98f011a6f",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480",
+                    "stateRoot" : "0x2aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x62b66c05137a7ba59762406db8f8fbaed866778651b1c7b788916654e5984491",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902dff901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45a062b66c05137a7ba59762406db8f8fbaed866778651b1c7b788916654e5984491a0138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c0fb8203e880a04d4f71ebffa028f5662b38f8dde4640511201954141a56f259923fd2765794b888cd1b27e98f011a6ff8e0f8de800183015f9094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ca04e7832772c8ce4be2d35a0f416c7a4bec0cb9658565723f2972c413fccf5484ba0668916ba9e0ec86860fd51a9903badcbd92bb99013e16c79c2f544b5e0f4d66bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e7832772c8ce4be2d35a0f416c7a4bec0cb9658565723f2972c413fccf5484b",
+                        "s" : "0x668916ba9e0ec86860fd51a9903badcbd92bb99013e16c79c2f544b5e0f4d66b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1f149baf1610f0bb88cc76a902deafbc34bb218a28196ba265e3bb470b202fd6",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c0fb",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3f05",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d32g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g1v0Filler.json",
+            "sourceHash" : "24dc4875cea2b877ae6ead4c57f8c3f54e043700616c6535b31564c0e3a3cca3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc0fb",
+                    "hash" : "0x1c6350ef6cae0ca0c0957f02f8abb2e3ce854d09765f2bee85ec1f32918dca93",
+                    "mixHash" : "0x87594a06d5324214bbff0e8246c5151e38647de39cd9cb5c3996145405cdf910",
+                    "nonce" : "0x5b93ffd58bc4068f",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480",
+                    "stateRoot" : "0x2aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x62b66c05137a7ba59762406db8f8fbaed866778651b1c7b788916654e5984491",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902dff901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45a062b66c05137a7ba59762406db8f8fbaed866778651b1c7b788916654e5984491a0138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c0fb8203e880a087594a06d5324214bbff0e8246c5151e38647de39cd9cb5c3996145405cdf910885b93ffd58bc4068ff8e0f8de800183015f9094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ca04e7832772c8ce4be2d35a0f416c7a4bec0cb9658565723f2972c413fccf5484ba0668916ba9e0ec86860fd51a9903badcbd92bb99013e16c79c2f544b5e0f4d66bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e7832772c8ce4be2d35a0f416c7a4bec0cb9658565723f2972c413fccf5484b",
+                        "s" : "0x668916ba9e0ec86860fd51a9903badcbd92bb99013e16c79c2f544b5e0f4d66b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1c6350ef6cae0ca0c0957f02f8abb2e3ce854d09765f2bee85ec1f32918dca93",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c0fb",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3f05",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g2v0.json
index cd7e2f067..899575a60 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g2v0.json
@@ -2,10 +2,10 @@
     "modexp_d32g2v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g2v0Filler.json",
-            "sourceHash" : "f340b6fb85fc07e1d0e59519e55bc0cb62a14bfd269f4c1be3eba15bd9aa0f55"
+            "sourceHash" : "de946cce6383ffadde3390b1983475b199ee6d34fd078a66f8f23dd8069c7ca2"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xfe30",
-                    "hash" : "0xf016dea237653681d3008816ba538b41f75a947f3096d4d76a8daceff29757ea",
-                    "mixHash" : "0xd6c1a3e051cbacc8c885d12f57150a4ff32dcb800db96f4c8497294af684675b",
-                    "nonce" : "0x99839c1eaa2be590",
+                    "hash" : "0x2da85957092f03a4a9f5cf046de7cbd77a5e64bd3f7d1fe0a54abbeaf05a2f96",
+                    "mixHash" : "0x89479c7016e6cecd9cfbe3ea172c21c008f8dd5e2dfb33ad3f35b1fb9276ed39",
+                    "nonce" : "0x0f9b703316da1730",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x536315b2b85bfa9fe121eef8e00cdf5a5811c248dd2bc6397fc669981fabbacb",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xa8e327755f170fc04367a1405740f9899676c9872a38b1d25325dafb9c28ae80",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902dff901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa059ac20827045e64edabe59121f9018e33e4e86a51bb2496a6e4efe0a6cd5becaa0a8e327755f170fc04367a1405740f9899676c9872a38b1d25325dafb9c28ae80a0536315b2b85bfa9fe121eef8e00cdf5a5811c248dd2bc6397fc669981fabbacbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fe308203e880a0d6c1a3e051cbacc8c885d12f57150a4ff32dcb800db96f4c8497294af684675b8899839c1eaa2be590f8e0f8de80018301adb094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ca0eb9d2a0425e4ca1765f617e10acc60cdeff547ae1b88c6776430b02462b6c42aa073b979bf118334a5171956b64a09b0d38d23be59d905e363d7a0980609ee564ac0",
+                "rlp" : "0xf902dff901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa059ac20827045e64edabe59121f9018e33e4e86a51bb2496a6e4efe0a6cd5becaa0a8e327755f170fc04367a1405740f9899676c9872a38b1d25325dafb9c28ae80a0536315b2b85bfa9fe121eef8e00cdf5a5811c248dd2bc6397fc669981fabbacbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fe308203e880a089479c7016e6cecd9cfbe3ea172c21c008f8dd5e2dfb33ad3f35b1fb9276ed39880f9b703316da1730f8e0f8de80018301adb094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ca0eb9d2a0425e4ca1765f617e10acc60cdeff547ae1b88c6776430b02462b6c42aa073b979bf118334a5171956b64a09b0d38d23be59d905e363d7a0980609ee564ac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf016dea237653681d3008816ba538b41f75a947f3096d4d76a8daceff29757ea",
+        "lastblockhash" : "0x2da85957092f03a4a9f5cf046de7cbd77a5e64bd3f7d1fe0a54abbeaf05a2f96",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d32g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g2v0Filler.json",
+            "sourceHash" : "de946cce6383ffadde3390b1983475b199ee6d34fd078a66f8f23dd8069c7ca2"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc0fb",
+                    "hash" : "0xf5c704e251f1237dc23bd8c6666a54d1def040101d62f1e903d0e49369e9ccac",
+                    "mixHash" : "0x4dda5be48dea1e52bc629a001fc213bddceaea0b4876789ed9dbe17839457b07",
+                    "nonce" : "0xfd71851c6bb19af2",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480",
+                    "stateRoot" : "0x2aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa8e327755f170fc04367a1405740f9899676c9872a38b1d25325dafb9c28ae80",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902dff901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45a0a8e327755f170fc04367a1405740f9899676c9872a38b1d25325dafb9c28ae80a0138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c0fb8203e880a04dda5be48dea1e52bc629a001fc213bddceaea0b4876789ed9dbe17839457b0788fd71851c6bb19af2f8e0f8de80018301adb094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ca0eb9d2a0425e4ca1765f617e10acc60cdeff547ae1b88c6776430b02462b6c42aa073b979bf118334a5171956b64a09b0d38d23be59d905e363d7a0980609ee564ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb9d2a0425e4ca1765f617e10acc60cdeff547ae1b88c6776430b02462b6c42a",
+                        "s" : "0x73b979bf118334a5171956b64a09b0d38d23be59d905e363d7a0980609ee564a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf5c704e251f1237dc23bd8c6666a54d1def040101d62f1e903d0e49369e9ccac",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c0fb",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3f05",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d32g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g2v0Filler.json",
+            "sourceHash" : "de946cce6383ffadde3390b1983475b199ee6d34fd078a66f8f23dd8069c7ca2"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc0fb",
+                    "hash" : "0x53390a2483b79e63cb2fc5ef41db5593f5491aa94cd9ad43948d4a61c233258e",
+                    "mixHash" : "0xd87566237f53758090ef152b10acaa34ca097d6d42eed357295be00bfd6ac592",
+                    "nonce" : "0xc592be3fae12b892",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480",
+                    "stateRoot" : "0x2aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa8e327755f170fc04367a1405740f9899676c9872a38b1d25325dafb9c28ae80",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902dff901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45a0a8e327755f170fc04367a1405740f9899676c9872a38b1d25325dafb9c28ae80a0138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c0fb8203e880a0d87566237f53758090ef152b10acaa34ca097d6d42eed357295be00bfd6ac59288c592be3fae12b892f8e0f8de80018301adb094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ca0eb9d2a0425e4ca1765f617e10acc60cdeff547ae1b88c6776430b02462b6c42aa073b979bf118334a5171956b64a09b0d38d23be59d905e363d7a0980609ee564ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb9d2a0425e4ca1765f617e10acc60cdeff547ae1b88c6776430b02462b6c42a",
+                        "s" : "0x73b979bf118334a5171956b64a09b0d38d23be59d905e363d7a0980609ee564a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x53390a2483b79e63cb2fc5ef41db5593f5491aa94cd9ad43948d4a61c233258e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c0fb",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3f05",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g3v0.json
index 53d20b286..cfeea87d1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d32g3v0.json
@@ -2,10 +2,10 @@
     "modexp_d32g3v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g3v0Filler.json",
-            "sourceHash" : "8638a52b164207410a1fe46f97139d7b07faa39d9d1be681447386225d0c5b0d"
+            "sourceHash" : "c7e79df89dbaf042ccba8f510a4934ed40740f75be4d23cac5e5a28aa72e9ccd"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xfe30",
-                    "hash" : "0xcb4fc959003328e9a5e4427d3a91e35cca993710dd9041c0b0335027c0a6399d",
-                    "mixHash" : "0xba4a2caba109a40e328999118a48b0180368e3f53d5ba50a5b3600bd033d8a4c",
-                    "nonce" : "0xddb2e6150c2ecc12",
+                    "hash" : "0xe7f563f4863829c729ad8fafb34fe4b13159a3e8d0566bf4e035cd07204ba47c",
+                    "mixHash" : "0x92a2bcf30961b9c139a0d1c28bb0c59e94bd326c8d81ad1284ecbf4b8014c40d",
+                    "nonce" : "0x662e0b842d726902",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x536315b2b85bfa9fe121eef8e00cdf5a5811c248dd2bc6397fc669981fabbacb",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x06eb41b2c5a0e50f1b2b3449a8107038910c6da5e5685cac7e0ff777cc883732",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902dff901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa059ac20827045e64edabe59121f9018e33e4e86a51bb2496a6e4efe0a6cd5becaa006eb41b2c5a0e50f1b2b3449a8107038910c6da5e5685cac7e0ff777cc883732a0536315b2b85bfa9fe121eef8e00cdf5a5811c248dd2bc6397fc669981fabbacbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fe308203e880a0ba4a2caba109a40e328999118a48b0180368e3f53d5ba50a5b3600bd033d8a4c88ddb2e6150c2ecc12f8e0f8de800183030d4094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ca0a4169000e09babc920b1b9ccac4abaa1fec0e2af7a02c7c4d0edafcf6e59e08da07cb5f1aa890db9d4499fe04d86729e703905e8068f2b59f71ff77ad26f1211fcc0",
+                "rlp" : "0xf902dff901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa059ac20827045e64edabe59121f9018e33e4e86a51bb2496a6e4efe0a6cd5becaa006eb41b2c5a0e50f1b2b3449a8107038910c6da5e5685cac7e0ff777cc883732a0536315b2b85bfa9fe121eef8e00cdf5a5811c248dd2bc6397fc669981fabbacbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082fe308203e880a092a2bcf30961b9c139a0d1c28bb0c59e94bd326c8d81ad1284ecbf4b8014c40d88662e0b842d726902f8e0f8de800183030d4094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ca0a4169000e09babc920b1b9ccac4abaa1fec0e2af7a02c7c4d0edafcf6e59e08da07cb5f1aa890db9d4499fe04d86729e703905e8068f2b59f71ff77ad26f1211fcc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb4fc959003328e9a5e4427d3a91e35cca993710dd9041c0b0335027c0a6399d",
+        "lastblockhash" : "0xe7f563f4863829c729ad8fafb34fe4b13159a3e8d0566bf4e035cd07204ba47c",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d32g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g3v0Filler.json",
+            "sourceHash" : "c7e79df89dbaf042ccba8f510a4934ed40740f75be4d23cac5e5a28aa72e9ccd"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc0fb",
+                    "hash" : "0xedb6260e082020cd8ec39b23fabf5f040b607c8f1b196d99cbe7c9bbb005b498",
+                    "mixHash" : "0x4b69114861f6d03ef3547c41a389b83e256b645666799207b17ca00229700704",
+                    "nonce" : "0xe665e26580f83aa6",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480",
+                    "stateRoot" : "0x2aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x06eb41b2c5a0e50f1b2b3449a8107038910c6da5e5685cac7e0ff777cc883732",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902dff901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45a006eb41b2c5a0e50f1b2b3449a8107038910c6da5e5685cac7e0ff777cc883732a0138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c0fb8203e880a04b69114861f6d03ef3547c41a389b83e256b645666799207b17ca0022970070488e665e26580f83aa6f8e0f8de800183030d4094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ca0a4169000e09babc920b1b9ccac4abaa1fec0e2af7a02c7c4d0edafcf6e59e08da07cb5f1aa890db9d4499fe04d86729e703905e8068f2b59f71ff77ad26f1211fcc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa4169000e09babc920b1b9ccac4abaa1fec0e2af7a02c7c4d0edafcf6e59e08d",
+                        "s" : "0x7cb5f1aa890db9d4499fe04d86729e703905e8068f2b59f71ff77ad26f1211fc",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xedb6260e082020cd8ec39b23fabf5f040b607c8f1b196d99cbe7c9bbb005b498",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c0fb",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3f05",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d32g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g3v0Filler.json",
+            "sourceHash" : "c7e79df89dbaf042ccba8f510a4934ed40740f75be4d23cac5e5a28aa72e9ccd"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc0fb",
+                    "hash" : "0x3e994f880bed7b22bad364e4ce3fd7e98629644c58031b37e3d29a6b647d43f9",
+                    "mixHash" : "0xc7eef104928dc353855225b3815ef194d068fdf5bb5cf3b1e466c5c2a691acac",
+                    "nonce" : "0xa8642a193d57a2f4",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480",
+                    "stateRoot" : "0x2aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x06eb41b2c5a0e50f1b2b3449a8107038910c6da5e5685cac7e0ff777cc883732",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902dff901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aa2f83869b0416ede62380b7a0ebcfe065a1abe863fdd76af4af48e2e5dff45a006eb41b2c5a0e50f1b2b3449a8107038910c6da5e5685cac7e0ff777cc883732a0138ab6e8c6821d23f322dbb234e839c064f93f3b54ae1c45e8b0379103ee6480b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c0fb8203e880a0c7eef104928dc353855225b3815ef194d068fdf5bb5cf3b1e466c5c2a691acac88a8642a193d57a2f4f8e0f8de800183030d4094100000000000000000000000000000000000000080b87d0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb1ca0a4169000e09babc920b1b9ccac4abaa1fec0e2af7a02c7c4d0edafcf6e59e08da07cb5f1aa890db9d4499fe04d86729e703905e8068f2b59f71ff77ad26f1211fcc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa4169000e09babc920b1b9ccac4abaa1fec0e2af7a02c7c4d0edafcf6e59e08d",
+                        "s" : "0x7cb5f1aa890db9d4499fe04d86729e703905e8068f2b59f71ff77ad26f1211fc",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3e994f880bed7b22bad364e4ce3fd7e98629644c58031b37e3d29a6b647d43f9",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c0fb",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3f05",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g0v0.json
index ebc3125a7..6d7d34934 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d33g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g0v0Filler.json",
             "sourceHash" : "27028ef7042820b8910986ed7543354ece8de5cb9b54d8ca228903dac05ea247"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf8f9",
-                    "hash" : "0x7a08f8603da3bf45a55ba3e53881a52f1c0280d89e0b56b7df223b483becd565",
-                    "mixHash" : "0x373ea29c4a9bdeaa8ac170fda5fc26601f4d7bb8baf252a1749a3a349a4da591",
-                    "nonce" : "0x02b397f31e4937f2",
+                    "hash" : "0x3356a19d385fccf81013300ee78954f639fb6fd2708d8e4a3168d2631367197e",
+                    "mixHash" : "0x34c60d2e36bf56d4473e43d2b28331942eb500639991341754bcd21355891648",
+                    "nonce" : "0x7d270463836ef4e9",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xafafc2fb4c02c283cc6675683dc372b34c9d11168287216e48122089f27ecd76",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xeeb9d0d86c90d4632527f0fe88f00054b229cd7a6bfcb0f88fbb8cc585be21ea",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902d5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fda723c2eb89946ed66c34aed354af35f2d008d3fae57362aa9bbd971ab3ac54a0eeb9d0d86c90d4632527f0fe88f00054b229cd7a6bfcb0f88fbb8cc585be21eaa0afafc2fb4c02c283cc6675683dc372b34c9d11168287216e48122089f27ecd76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f8f98203e880a0373ea29c4a9bdeaa8ac170fda5fc26601f4d7bb8baf252a1749a3a349a4da5918802b397f31e4937f2f8d6f8d480018405f5e10094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ca0cd941ae9285fbf4a5e9bb6a01b450da06fbe76a43e3157bbc701018bfbd72adca04b358895ac69473004da568c904c6397678b9d41805e0eec842f99059be03154c0",
+                "rlp" : "0xf902d5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fda723c2eb89946ed66c34aed354af35f2d008d3fae57362aa9bbd971ab3ac54a0eeb9d0d86c90d4632527f0fe88f00054b229cd7a6bfcb0f88fbb8cc585be21eaa0afafc2fb4c02c283cc6675683dc372b34c9d11168287216e48122089f27ecd76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f8f98203e880a034c60d2e36bf56d4473e43d2b28331942eb500639991341754bcd21355891648887d270463836ef4e9f8d6f8d480018405f5e10094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ca0cd941ae9285fbf4a5e9bb6a01b450da06fbe76a43e3157bbc701018bfbd72adca04b358895ac69473004da568c904c6397678b9d41805e0eec842f99059be03154c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7a08f8603da3bf45a55ba3e53881a52f1c0280d89e0b56b7df223b483becd565",
+        "lastblockhash" : "0x3356a19d385fccf81013300ee78954f639fb6fd2708d8e4a3168d2631367197e",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d33g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g0v0Filler.json",
             "sourceHash" : "27028ef7042820b8910986ed7543354ece8de5cb9b54d8ca228903dac05ea247"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xbe0f",
-                    "hash" : "0xcf26c5b177ade0b6e77aea6373bf1c60a024548680443770b992ff2607ca1a42",
-                    "mixHash" : "0x42846323867fceaf262aff644a2a0246e98ba9b5291e073debad8e6c6bf4e06f",
-                    "nonce" : "0x624e259be947c073",
+                    "hash" : "0x76f4178c133658d8ece7574e6af7112d38da1363f861c84fe9cd66e58f904b84",
+                    "mixHash" : "0x556d7333620891f2ddc5efd260e32a040d1954f93f6e1a34ebeceaf3bd3ef886",
+                    "nonce" : "0xc023e606e6bac03f",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33ee",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0xeeb9d0d86c90d4632527f0fe88f00054b229cd7a6bfcb0f88fbb8cc585be21ea",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902d5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432da0eeb9d0d86c90d4632527f0fe88f00054b229cd7a6bfcb0f88fbb8cc585be21eaa0ba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be0f8203e880a042846323867fceaf262aff644a2a0246e98ba9b5291e073debad8e6c6bf4e06f88624e259be947c073f8d6f8d480018405f5e10094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ca0cd941ae9285fbf4a5e9bb6a01b450da06fbe76a43e3157bbc701018bfbd72adca04b358895ac69473004da568c904c6397678b9d41805e0eec842f99059be03154c0",
+                "rlp" : "0xf902d5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432da0eeb9d0d86c90d4632527f0fe88f00054b229cd7a6bfcb0f88fbb8cc585be21eaa0ba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be0f8203e880a0556d7333620891f2ddc5efd260e32a040d1954f93f6e1a34ebeceaf3bd3ef88688c023e606e6bac03ff8d6f8d480018405f5e10094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ca0cd941ae9285fbf4a5e9bb6a01b450da06fbe76a43e3157bbc701018bfbd72adca04b358895ac69473004da568c904c6397678b9d41805e0eec842f99059be03154c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf26c5b177ade0b6e77aea6373bf1c60a024548680443770b992ff2607ca1a42",
+        "lastblockhash" : "0x76f4178c133658d8ece7574e6af7112d38da1363f861c84fe9cd66e58f904b84",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d33g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g0v0Filler.json",
             "sourceHash" : "27028ef7042820b8910986ed7543354ece8de5cb9b54d8ca228903dac05ea247"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xbe0f",
-                    "hash" : "0x45b06409742c936940be65d7da6718d7b803bdf36f5514d39189a96ee573afb2",
-                    "mixHash" : "0x430b53e7600327ccd47c77526e172cec542b7376c8326ef36effd4a0fe6d9257",
-                    "nonce" : "0xe424e93a1574dfd7",
+                    "hash" : "0x780de62aa231c753f6fd654496a77fb2a8935a6ba52df73762ab5c53555b012c",
+                    "mixHash" : "0xfb420fe29549743b8db2074b29763b81de3e45bfa786f5118b616639b28353d4",
+                    "nonce" : "0xe82235476ef48d5d",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33ee",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0xeeb9d0d86c90d4632527f0fe88f00054b229cd7a6bfcb0f88fbb8cc585be21ea",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902d5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432da0eeb9d0d86c90d4632527f0fe88f00054b229cd7a6bfcb0f88fbb8cc585be21eaa0ba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be0f8203e880a0430b53e7600327ccd47c77526e172cec542b7376c8326ef36effd4a0fe6d925788e424e93a1574dfd7f8d6f8d480018405f5e10094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ca0cd941ae9285fbf4a5e9bb6a01b450da06fbe76a43e3157bbc701018bfbd72adca04b358895ac69473004da568c904c6397678b9d41805e0eec842f99059be03154c0",
+                "rlp" : "0xf902d5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432da0eeb9d0d86c90d4632527f0fe88f00054b229cd7a6bfcb0f88fbb8cc585be21eaa0ba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be0f8203e880a0fb420fe29549743b8db2074b29763b81de3e45bfa786f5118b616639b28353d488e82235476ef48d5df8d6f8d480018405f5e10094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ca0cd941ae9285fbf4a5e9bb6a01b450da06fbe76a43e3157bbc701018bfbd72adca04b358895ac69473004da568c904c6397678b9d41805e0eec842f99059be03154c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x45b06409742c936940be65d7da6718d7b803bdf36f5514d39189a96ee573afb2",
+        "lastblockhash" : "0x780de62aa231c753f6fd654496a77fb2a8935a6ba52df73762ab5c53555b012c",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g1v0.json
index 4fba6aec9..c0d29db3b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g1v0.json
@@ -2,10 +2,10 @@
     "modexp_d33g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g1v0Filler.json",
-            "sourceHash" : "8ffc64949a0e0b4266afea8e244581ac96f707bee4cbff856171360b3c403956"
+            "sourceHash" : "88975e2303cbcac888a16bb8a45c462e5f271ac193df9539f4623629583eda05"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf8f9",
-                    "hash" : "0xb72f33f821666f9648eac96b63a17bee8f97b691b8bc13c93f5a0a713af8e31e",
-                    "mixHash" : "0x40c054d9f38d2d04080f9200e73421eebbd14488b928c8ce71dfee028ae382d7",
-                    "nonce" : "0x73e381778efa36c8",
+                    "hash" : "0xcde4fe3ad2df3fbb93025394dce2cbc89ba7c98c34e2b21b05150abd181e2345",
+                    "mixHash" : "0x78f89ddc88cbc8451576efe5677d0220baa2f354fdbf9d152bac915507d2fb8a",
+                    "nonce" : "0x405cf58b599cb9a9",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xafafc2fb4c02c283cc6675683dc372b34c9d11168287216e48122089f27ecd76",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x6f99ac713d3ba629a33599b79ed8227920302fd53f6bce22cabcb13cc7158d72",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902d4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fda723c2eb89946ed66c34aed354af35f2d008d3fae57362aa9bbd971ab3ac54a06f99ac713d3ba629a33599b79ed8227920302fd53f6bce22cabcb13cc7158d72a0afafc2fb4c02c283cc6675683dc372b34c9d11168287216e48122089f27ecd76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f8f98203e880a040c054d9f38d2d04080f9200e73421eebbd14488b928c8ce71dfee028ae382d78873e381778efa36c8f8d5f8d3800183015f9094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ba0d38a6fd8e6ddb4e86f56935d6ef3c80b95a6be248629d8574ea32385d8826818a06ad42dd4f92add47d966b05d1efa6035cd37947f11a865b45e82c56352c9cb4bc0",
+                "rlp" : "0xf902d4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fda723c2eb89946ed66c34aed354af35f2d008d3fae57362aa9bbd971ab3ac54a06f99ac713d3ba629a33599b79ed8227920302fd53f6bce22cabcb13cc7158d72a0afafc2fb4c02c283cc6675683dc372b34c9d11168287216e48122089f27ecd76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f8f98203e880a078f89ddc88cbc8451576efe5677d0220baa2f354fdbf9d152bac915507d2fb8a88405cf58b599cb9a9f8d5f8d3800183015f9094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ba0d38a6fd8e6ddb4e86f56935d6ef3c80b95a6be248629d8574ea32385d8826818a06ad42dd4f92add47d966b05d1efa6035cd37947f11a865b45e82c56352c9cb4bc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb72f33f821666f9648eac96b63a17bee8f97b691b8bc13c93f5a0a713af8e31e",
+        "lastblockhash" : "0xcde4fe3ad2df3fbb93025394dce2cbc89ba7c98c34e2b21b05150abd181e2345",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d33g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g1v0Filler.json",
+            "sourceHash" : "88975e2303cbcac888a16bb8a45c462e5f271ac193df9539f4623629583eda05"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbe0f",
+                    "hash" : "0x86ca8f9a10e9ceb134ba6f76a7d7b45c016df70fa1739b4ac4c9b33d741e0db9",
+                    "mixHash" : "0x4a4e8586bef711fd5acddd08069c37b0d7ed61646ff9fbc7393cdb2aafc60598",
+                    "nonce" : "0x8b3b4aa3433fca22",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33ee",
+                    "stateRoot" : "0x5d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6f99ac713d3ba629a33599b79ed8227920302fd53f6bce22cabcb13cc7158d72",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902d4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432da06f99ac713d3ba629a33599b79ed8227920302fd53f6bce22cabcb13cc7158d72a0ba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be0f8203e880a04a4e8586bef711fd5acddd08069c37b0d7ed61646ff9fbc7393cdb2aafc60598888b3b4aa3433fca22f8d5f8d3800183015f9094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ba0d38a6fd8e6ddb4e86f56935d6ef3c80b95a6be248629d8574ea32385d8826818a06ad42dd4f92add47d966b05d1efa6035cd37947f11a865b45e82c56352c9cb4bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd38a6fd8e6ddb4e86f56935d6ef3c80b95a6be248629d8574ea32385d8826818",
+                        "s" : "0x6ad42dd4f92add47d966b05d1efa6035cd37947f11a865b45e82c56352c9cb4b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x86ca8f9a10e9ceb134ba6f76a7d7b45c016df70fa1739b4ac4c9b33d741e0db9",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4be0f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f41f1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d33g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g1v0Filler.json",
+            "sourceHash" : "88975e2303cbcac888a16bb8a45c462e5f271ac193df9539f4623629583eda05"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbe0f",
+                    "hash" : "0x97a0f94259e88f63405452a52df9c0bf0c9ac799255130e14e7bc7d155917a98",
+                    "mixHash" : "0x0528e7a74d55ad736d268539a474933dcdc42a127b9fc962ea9adcee01dc51a1",
+                    "nonce" : "0xaa52eec4dd108987",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33ee",
+                    "stateRoot" : "0x5d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6f99ac713d3ba629a33599b79ed8227920302fd53f6bce22cabcb13cc7158d72",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902d4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432da06f99ac713d3ba629a33599b79ed8227920302fd53f6bce22cabcb13cc7158d72a0ba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be0f8203e880a00528e7a74d55ad736d268539a474933dcdc42a127b9fc962ea9adcee01dc51a188aa52eec4dd108987f8d5f8d3800183015f9094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ba0d38a6fd8e6ddb4e86f56935d6ef3c80b95a6be248629d8574ea32385d8826818a06ad42dd4f92add47d966b05d1efa6035cd37947f11a865b45e82c56352c9cb4bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd38a6fd8e6ddb4e86f56935d6ef3c80b95a6be248629d8574ea32385d8826818",
+                        "s" : "0x6ad42dd4f92add47d966b05d1efa6035cd37947f11a865b45e82c56352c9cb4b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x97a0f94259e88f63405452a52df9c0bf0c9ac799255130e14e7bc7d155917a98",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4be0f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f41f1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g2v0.json
index 5330bbd65..48d41cb1f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g2v0.json
@@ -2,10 +2,10 @@
     "modexp_d33g2v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g2v0Filler.json",
-            "sourceHash" : "fe86996e2e54ceb5081bf0e01c15913fbb5d415a566653902c0284dca6085bdc"
+            "sourceHash" : "bb2d428d12342c7939b375a04e7785015ac233ca6d9b0e5e4eb932df16d8c002"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf8f9",
-                    "hash" : "0xb9af65c4d597918a08a8a929c899d10f5ac9aa6db7a6cd6b9ed8f9ba90f30c53",
-                    "mixHash" : "0xa8732863e31969e6b008d3c82d1e8f500f267913212cdf27a51dad0e0adcaab1",
-                    "nonce" : "0x337a8442ff76be74",
+                    "hash" : "0x5955d247c21e8242818f4d2fd9cd84b7df7be85fb79dc476bbc65d9fe0d6ee77",
+                    "mixHash" : "0xecf33555ea912db4cfdedb76323174d43d71d134a45477a79c61e44d314fbe85",
+                    "nonce" : "0x81c743cbc152a86f",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xafafc2fb4c02c283cc6675683dc372b34c9d11168287216e48122089f27ecd76",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x2e6b040a71cf50833edc65b7e6c4b03356d120eaebc3c90bd4060916f291f7a3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902d4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fda723c2eb89946ed66c34aed354af35f2d008d3fae57362aa9bbd971ab3ac54a02e6b040a71cf50833edc65b7e6c4b03356d120eaebc3c90bd4060916f291f7a3a0afafc2fb4c02c283cc6675683dc372b34c9d11168287216e48122089f27ecd76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f8f98203e880a0a8732863e31969e6b008d3c82d1e8f500f267913212cdf27a51dad0e0adcaab188337a8442ff76be74f8d5f8d380018301adb094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ca0e49b4b602c111f082e0b3518bd03eb88100bd479d5a13e14ccd5e223c575aedba0473d60dd4b9ba00d3df6103cbedcb9890ef24ef803d8dc662089243e142acf98c0",
+                "rlp" : "0xf902d4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fda723c2eb89946ed66c34aed354af35f2d008d3fae57362aa9bbd971ab3ac54a02e6b040a71cf50833edc65b7e6c4b03356d120eaebc3c90bd4060916f291f7a3a0afafc2fb4c02c283cc6675683dc372b34c9d11168287216e48122089f27ecd76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f8f98203e880a0ecf33555ea912db4cfdedb76323174d43d71d134a45477a79c61e44d314fbe858881c743cbc152a86ff8d5f8d380018301adb094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ca0e49b4b602c111f082e0b3518bd03eb88100bd479d5a13e14ccd5e223c575aedba0473d60dd4b9ba00d3df6103cbedcb9890ef24ef803d8dc662089243e142acf98c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb9af65c4d597918a08a8a929c899d10f5ac9aa6db7a6cd6b9ed8f9ba90f30c53",
+        "lastblockhash" : "0x5955d247c21e8242818f4d2fd9cd84b7df7be85fb79dc476bbc65d9fe0d6ee77",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d33g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g2v0Filler.json",
+            "sourceHash" : "bb2d428d12342c7939b375a04e7785015ac233ca6d9b0e5e4eb932df16d8c002"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbe0f",
+                    "hash" : "0x322b4cd95501154ba3851c2c8304d3288cf57b5fba66bb55c27baf9ec2c50c3c",
+                    "mixHash" : "0x5b2c2efdc72586b71d8969fca61c2b61e46edf79be61605756f457b87a728506",
+                    "nonce" : "0xa9c73f3b7072331c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33ee",
+                    "stateRoot" : "0x5d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2e6b040a71cf50833edc65b7e6c4b03356d120eaebc3c90bd4060916f291f7a3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902d4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432da02e6b040a71cf50833edc65b7e6c4b03356d120eaebc3c90bd4060916f291f7a3a0ba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be0f8203e880a05b2c2efdc72586b71d8969fca61c2b61e46edf79be61605756f457b87a72850688a9c73f3b7072331cf8d5f8d380018301adb094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ca0e49b4b602c111f082e0b3518bd03eb88100bd479d5a13e14ccd5e223c575aedba0473d60dd4b9ba00d3df6103cbedcb9890ef24ef803d8dc662089243e142acf98c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe49b4b602c111f082e0b3518bd03eb88100bd479d5a13e14ccd5e223c575aedb",
+                        "s" : "0x473d60dd4b9ba00d3df6103cbedcb9890ef24ef803d8dc662089243e142acf98",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x322b4cd95501154ba3851c2c8304d3288cf57b5fba66bb55c27baf9ec2c50c3c",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4be0f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f41f1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d33g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g2v0Filler.json",
+            "sourceHash" : "bb2d428d12342c7939b375a04e7785015ac233ca6d9b0e5e4eb932df16d8c002"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbe0f",
+                    "hash" : "0x5d40c4e065a5ef47442e3277101f74172d49c74f76fd07a99e37752d4794b443",
+                    "mixHash" : "0x1cd0c8785473e5e2e299a5e070e8821d5897d5f8a64518f5680d60c0731f84d4",
+                    "nonce" : "0xb0994371730d6116",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33ee",
+                    "stateRoot" : "0x5d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2e6b040a71cf50833edc65b7e6c4b03356d120eaebc3c90bd4060916f291f7a3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902d4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432da02e6b040a71cf50833edc65b7e6c4b03356d120eaebc3c90bd4060916f291f7a3a0ba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be0f8203e880a01cd0c8785473e5e2e299a5e070e8821d5897d5f8a64518f5680d60c0731f84d488b0994371730d6116f8d5f8d380018301adb094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ca0e49b4b602c111f082e0b3518bd03eb88100bd479d5a13e14ccd5e223c575aedba0473d60dd4b9ba00d3df6103cbedcb9890ef24ef803d8dc662089243e142acf98c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe49b4b602c111f082e0b3518bd03eb88100bd479d5a13e14ccd5e223c575aedb",
+                        "s" : "0x473d60dd4b9ba00d3df6103cbedcb9890ef24ef803d8dc662089243e142acf98",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5d40c4e065a5ef47442e3277101f74172d49c74f76fd07a99e37752d4794b443",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4be0f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f41f1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g3v0.json
index 6eb9346d6..a277bf063 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d33g3v0.json
@@ -2,10 +2,10 @@
     "modexp_d33g3v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g3v0Filler.json",
-            "sourceHash" : "b20ecafee2bb87b77a01d85aacb761f378c541619051e269ba7e0c1bb592cc8b"
+            "sourceHash" : "9d57331fe8349ccce760bf78750478d3de8402d75b0347caf51be71d0cfd1a34"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf8f9",
-                    "hash" : "0x97955670a8abb7f61b3dd812ff92aa02e48ec317f8c6d02036aa91dfaa3c8ddc",
-                    "mixHash" : "0xf7189d433a81c9c812e4c4ffbb26ecf25759a6870d30e0b0cef0357d0cb2267b",
-                    "nonce" : "0x08ebe59187a6fd17",
+                    "hash" : "0x9515d9d1cfeb0a5e6ec3d39c2f3eb84f0a42345b2369b3d338b7131060158562",
+                    "mixHash" : "0x24eda850044bc19128a0f13e75031ab887b7275653a58afc558c13bb62e31b1e",
+                    "nonce" : "0x01e8e09ab566bbda",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xafafc2fb4c02c283cc6675683dc372b34c9d11168287216e48122089f27ecd76",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x6fa8cac0b24441331dae4875661c10555b21daac9b6758a5d23f8a04ca6d0616",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902d4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fda723c2eb89946ed66c34aed354af35f2d008d3fae57362aa9bbd971ab3ac54a06fa8cac0b24441331dae4875661c10555b21daac9b6758a5d23f8a04ca6d0616a0afafc2fb4c02c283cc6675683dc372b34c9d11168287216e48122089f27ecd76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f8f98203e880a0f7189d433a81c9c812e4c4ffbb26ecf25759a6870d30e0b0cef0357d0cb2267b8808ebe59187a6fd17f8d5f8d3800183030d4094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ba089b37585641a848728e40e809eafa759942213c016346577181e93e859cc9980a00423d1f219e02da91af50f7023d1447fc03c005e20a77fa8adc699d6cc2bc4a9c0",
+                "rlp" : "0xf902d4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fda723c2eb89946ed66c34aed354af35f2d008d3fae57362aa9bbd971ab3ac54a06fa8cac0b24441331dae4875661c10555b21daac9b6758a5d23f8a04ca6d0616a0afafc2fb4c02c283cc6675683dc372b34c9d11168287216e48122089f27ecd76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f8f98203e880a024eda850044bc19128a0f13e75031ab887b7275653a58afc558c13bb62e31b1e8801e8e09ab566bbdaf8d5f8d3800183030d4094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ba089b37585641a848728e40e809eafa759942213c016346577181e93e859cc9980a00423d1f219e02da91af50f7023d1447fc03c005e20a77fa8adc699d6cc2bc4a9c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x97955670a8abb7f61b3dd812ff92aa02e48ec317f8c6d02036aa91dfaa3c8ddc",
+        "lastblockhash" : "0x9515d9d1cfeb0a5e6ec3d39c2f3eb84f0a42345b2369b3d338b7131060158562",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d33g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g3v0Filler.json",
+            "sourceHash" : "9d57331fe8349ccce760bf78750478d3de8402d75b0347caf51be71d0cfd1a34"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbe0f",
+                    "hash" : "0xbe5b7442cc9a7fbb64d5810a3b64ab2ab53d9627b2842e16c9bd5280e6d9b13a",
+                    "mixHash" : "0x1957fbcf9e1c1a7703793203fab47839ebfa8fdef20b990898a3e8454a850d06",
+                    "nonce" : "0x538b98ba43595ed1",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33ee",
+                    "stateRoot" : "0x5d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6fa8cac0b24441331dae4875661c10555b21daac9b6758a5d23f8a04ca6d0616",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902d4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432da06fa8cac0b24441331dae4875661c10555b21daac9b6758a5d23f8a04ca6d0616a0ba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be0f8203e880a01957fbcf9e1c1a7703793203fab47839ebfa8fdef20b990898a3e8454a850d0688538b98ba43595ed1f8d5f8d3800183030d4094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ba089b37585641a848728e40e809eafa759942213c016346577181e93e859cc9980a00423d1f219e02da91af50f7023d1447fc03c005e20a77fa8adc699d6cc2bc4a9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89b37585641a848728e40e809eafa759942213c016346577181e93e859cc9980",
+                        "s" : "0x0423d1f219e02da91af50f7023d1447fc03c005e20a77fa8adc699d6cc2bc4a9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbe5b7442cc9a7fbb64d5810a3b64ab2ab53d9627b2842e16c9bd5280e6d9b13a",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4be0f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f41f1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d33g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g3v0Filler.json",
+            "sourceHash" : "9d57331fe8349ccce760bf78750478d3de8402d75b0347caf51be71d0cfd1a34"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbe0f",
+                    "hash" : "0xd8c94f93877a9b408287b4b1224f398f3964fde524aa475ded3311859b70a331",
+                    "mixHash" : "0xc7407a715885ef00702bf89a08108308974008573d09119495db0b3f1c5f3624",
+                    "nonce" : "0x1c273fb8a0fc75eb",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33ee",
+                    "stateRoot" : "0x5d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6fa8cac0b24441331dae4875661c10555b21daac9b6758a5d23f8a04ca6d0616",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902d4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d515ccd51052bedace4abf0838fb023d5b84e52f5aa1eabacd3e84fd5ed432da06fa8cac0b24441331dae4875661c10555b21daac9b6758a5d23f8a04ca6d0616a0ba1aebd5c54b76316f1afd42ae86558cc9c2abc34c648d96b612852d392e33eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be0f8203e880a0c7407a715885ef00702bf89a08108308974008573d09119495db0b3f1c5f3624881c273fb8a0fc75ebf8d5f8d3800183030d4094100000000000000000000000000000000000000080b8720000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae631ba089b37585641a848728e40e809eafa759942213c016346577181e93e859cc9980a00423d1f219e02da91af50f7023d1447fc03c005e20a77fa8adc699d6cc2bc4a9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89b37585641a848728e40e809eafa759942213c016346577181e93e859cc9980",
+                        "s" : "0x0423d1f219e02da91af50f7023d1447fc03c005e20a77fa8adc699d6cc2bc4a9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd8c94f93877a9b408287b4b1224f398f3964fde524aa475ded3311859b70a331",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4be0f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f41f1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g0v0.json
index daae529a0..ef097c8df 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d34g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g0v0Filler.json",
             "sourceHash" : "c22da3444270fe29b961cee317777ed673c53cd061b0186772b999bc61740821"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xff46",
-                    "hash" : "0x71758bb2865e0a9141226160813102ed3f53e6a382c982c7309f61233cae504c",
-                    "mixHash" : "0x61e0c92091f9bc68b6246dc815a6091a49296e82f51776b6aed88850ce71f23e",
-                    "nonce" : "0x03424966031dbbcf",
+                    "hash" : "0x8f567d0164be766f652324d52b42841d39c3a97a363902838628b9fd050651da",
+                    "mixHash" : "0xa94ef5fc25a6dc3e93901c044b07464d9daeef1f46150f9db710228fcbdaf75b",
+                    "nonce" : "0x1ef79d0c58b030a6",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x1afca786aee7fd5617c31288c6ed495179a6d02231de6ad81d97fda6ab12422e",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x3e0459056dfebecf3b5fd2c9b6d8325b714d683b806675b7ca66bb0f8e4b5ec3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08648e906dc7d0b0e49515cafcffcc13c1d6da94e5943778ce11b0e713b30e9f3a03e0459056dfebecf3b5fd2c9b6d8325b714d683b806675b7ca66bb0f8e4b5ec3a01afca786aee7fd5617c31288c6ed495179a6d02231de6ad81d97fda6ab12422eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ff468203e880a061e0c92091f9bc68b6246dc815a6091a49296e82f51776b6aed88850ce71f23e8803424966031dbbcff8e3f8e180018405f5e10094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba00bcf3a5f0882b60db9271c087c481312e30b90fd400b07e8e4889a300c0d5587a011a47cae526541f2e6b9f617d978bd680742028a05100e0c27e80e4dfdcae335c0",
+                "rlp" : "0xf902e2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08648e906dc7d0b0e49515cafcffcc13c1d6da94e5943778ce11b0e713b30e9f3a03e0459056dfebecf3b5fd2c9b6d8325b714d683b806675b7ca66bb0f8e4b5ec3a01afca786aee7fd5617c31288c6ed495179a6d02231de6ad81d97fda6ab12422eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ff468203e880a0a94ef5fc25a6dc3e93901c044b07464d9daeef1f46150f9db710228fcbdaf75b881ef79d0c58b030a6f8e3f8e180018405f5e10094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba00bcf3a5f0882b60db9271c087c481312e30b90fd400b07e8e4889a300c0d5587a011a47cae526541f2e6b9f617d978bd680742028a05100e0c27e80e4dfdcae335c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71758bb2865e0a9141226160813102ed3f53e6a382c982c7309f61233cae504c",
+        "lastblockhash" : "0x8f567d0164be766f652324d52b42841d39c3a97a363902838628b9fd050651da",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d34g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g0v0Filler.json",
             "sourceHash" : "c22da3444270fe29b961cee317777ed673c53cd061b0186772b999bc61740821"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xc183",
-                    "hash" : "0xc084e08c1cf271f75c334e74f307e3c940f93d7ef35782e7e5833254d609e920",
-                    "mixHash" : "0xc6fd3f48f7b91d60cd9292b2dad3e618d3e4023f0ee5e6a1cdda7ac23170b0e0",
-                    "nonce" : "0x7a5d8068163af88e",
+                    "hash" : "0x326ed02ca618c537cfb03029912fd4c5eaf174a35f6e62d7e9feb1ddd83d1d82",
+                    "mixHash" : "0x145e090033e199364274b32be3bcc246b71389734b56cbd0888d4ac22703f204",
+                    "nonce" : "0x047dad2c395129f5",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x3e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0x3e0459056dfebecf3b5fd2c9b6d8325b714d683b806675b7ca66bb0f8e4b5ec3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1dfa03e0459056dfebecf3b5fd2c9b6d8325b714d683b806675b7ca66bb0f8e4b5ec3a03e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c1838203e880a0c6fd3f48f7b91d60cd9292b2dad3e618d3e4023f0ee5e6a1cdda7ac23170b0e0887a5d8068163af88ef8e3f8e180018405f5e10094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba00bcf3a5f0882b60db9271c087c481312e30b90fd400b07e8e4889a300c0d5587a011a47cae526541f2e6b9f617d978bd680742028a05100e0c27e80e4dfdcae335c0",
+                "rlp" : "0xf902e2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1dfa03e0459056dfebecf3b5fd2c9b6d8325b714d683b806675b7ca66bb0f8e4b5ec3a03e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c1838203e880a0145e090033e199364274b32be3bcc246b71389734b56cbd0888d4ac22703f20488047dad2c395129f5f8e3f8e180018405f5e10094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba00bcf3a5f0882b60db9271c087c481312e30b90fd400b07e8e4889a300c0d5587a011a47cae526541f2e6b9f617d978bd680742028a05100e0c27e80e4dfdcae335c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc084e08c1cf271f75c334e74f307e3c940f93d7ef35782e7e5833254d609e920",
+        "lastblockhash" : "0x326ed02ca618c537cfb03029912fd4c5eaf174a35f6e62d7e9feb1ddd83d1d82",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d34g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g0v0Filler.json",
             "sourceHash" : "c22da3444270fe29b961cee317777ed673c53cd061b0186772b999bc61740821"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xc183",
-                    "hash" : "0x89fad5f5e0c9052727879855a25033308d9d9130b92b80d46addbbe275ad00ae",
-                    "mixHash" : "0xf3092d1afc4aa4b5cb9938ebbc4cf27017d4e02020e40c0e4d408ed54668319a",
-                    "nonce" : "0x3d14c760c903eeac",
+                    "hash" : "0x1d3df8558fb82813b21982c2117260a1722fc14d0ba9673bc127d0fba3c09d64",
+                    "mixHash" : "0xd8c8964285822b5826d7b1763489dab676188b3cf7e4220e63ec5a7de3e04471",
+                    "nonce" : "0xfa6e9539d5b5f1cf",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x3e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0x3e0459056dfebecf3b5fd2c9b6d8325b714d683b806675b7ca66bb0f8e4b5ec3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1dfa03e0459056dfebecf3b5fd2c9b6d8325b714d683b806675b7ca66bb0f8e4b5ec3a03e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c1838203e880a0f3092d1afc4aa4b5cb9938ebbc4cf27017d4e02020e40c0e4d408ed54668319a883d14c760c903eeacf8e3f8e180018405f5e10094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba00bcf3a5f0882b60db9271c087c481312e30b90fd400b07e8e4889a300c0d5587a011a47cae526541f2e6b9f617d978bd680742028a05100e0c27e80e4dfdcae335c0",
+                "rlp" : "0xf902e2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1dfa03e0459056dfebecf3b5fd2c9b6d8325b714d683b806675b7ca66bb0f8e4b5ec3a03e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c1838203e880a0d8c8964285822b5826d7b1763489dab676188b3cf7e4220e63ec5a7de3e0447188fa6e9539d5b5f1cff8e3f8e180018405f5e10094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba00bcf3a5f0882b60db9271c087c481312e30b90fd400b07e8e4889a300c0d5587a011a47cae526541f2e6b9f617d978bd680742028a05100e0c27e80e4dfdcae335c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x89fad5f5e0c9052727879855a25033308d9d9130b92b80d46addbbe275ad00ae",
+        "lastblockhash" : "0x1d3df8558fb82813b21982c2117260a1722fc14d0ba9673bc127d0fba3c09d64",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g1v0.json
index 90a77b907..d169c787f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g1v0.json
@@ -2,10 +2,10 @@
     "modexp_d34g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g1v0Filler.json",
-            "sourceHash" : "edc5fcd5a860046ca2863997789322176300033c6a6162191f0b31d3850f9e73"
+            "sourceHash" : "2590f8cbb6026371189c76a78b9c077c8519be05b6a587902bf226fc7bb6aa36"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xff46",
-                    "hash" : "0x10b6a0ba2ea92df4422e153eb809cb570944df4b570614c3cc9d292b8ea72bc4",
-                    "mixHash" : "0xe8a2d918c1adb5e0408ea8ece018c8ceb45ba7b0a916dd492425e3d011ab87b8",
-                    "nonce" : "0xa8da3fdf6fec2445",
+                    "hash" : "0x9b0e14843a8dc797636f8054627cf41be41a881f248866047eea31890bb15728",
+                    "mixHash" : "0x1d737d78a02e325e32ac307a9cddf40bb0ca5cb42face5fd02b6075083a831ae",
+                    "nonce" : "0x02d75e49d76cca29",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x1afca786aee7fd5617c31288c6ed495179a6d02231de6ad81d97fda6ab12422e",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x08fa9447ccd55e266c60e36beded05601969bec59a09d2195b268cd88cc5653b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e1f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08648e906dc7d0b0e49515cafcffcc13c1d6da94e5943778ce11b0e713b30e9f3a008fa9447ccd55e266c60e36beded05601969bec59a09d2195b268cd88cc5653ba01afca786aee7fd5617c31288c6ed495179a6d02231de6ad81d97fda6ab12422eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ff468203e880a0e8a2d918c1adb5e0408ea8ece018c8ceb45ba7b0a916dd492425e3d011ab87b888a8da3fdf6fec2445f8e2f8e0800183015f9094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba0c7c73113062a58bf7e0e82e2f72e370935e724fd5d83ed1e36822a2514f09e6da069f842a32725aa93e33e493bb5432d1b8763df8fea585ccaa8bb440713fa4a1bc0",
+                "rlp" : "0xf902e1f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08648e906dc7d0b0e49515cafcffcc13c1d6da94e5943778ce11b0e713b30e9f3a008fa9447ccd55e266c60e36beded05601969bec59a09d2195b268cd88cc5653ba01afca786aee7fd5617c31288c6ed495179a6d02231de6ad81d97fda6ab12422eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ff468203e880a01d737d78a02e325e32ac307a9cddf40bb0ca5cb42face5fd02b6075083a831ae8802d75e49d76cca29f8e2f8e0800183015f9094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba0c7c73113062a58bf7e0e82e2f72e370935e724fd5d83ed1e36822a2514f09e6da069f842a32725aa93e33e493bb5432d1b8763df8fea585ccaa8bb440713fa4a1bc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x10b6a0ba2ea92df4422e153eb809cb570944df4b570614c3cc9d292b8ea72bc4",
+        "lastblockhash" : "0x9b0e14843a8dc797636f8054627cf41be41a881f248866047eea31890bb15728",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d34g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g1v0Filler.json",
+            "sourceHash" : "2590f8cbb6026371189c76a78b9c077c8519be05b6a587902bf226fc7bb6aa36"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc183",
+                    "hash" : "0x08de7de28e82852f20a033850a75ba283255db4273e536457c0e9eb025e2435a",
+                    "mixHash" : "0xe3eb20073745acd21d68ea91272f12c55940b593eff16c4fbd33f334c195e436",
+                    "nonce" : "0x98cd23b1c42d95c4",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3",
+                    "stateRoot" : "0x5104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1df",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x08fa9447ccd55e266c60e36beded05601969bec59a09d2195b268cd88cc5653b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e1f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1dfa008fa9447ccd55e266c60e36beded05601969bec59a09d2195b268cd88cc5653ba03e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c1838203e880a0e3eb20073745acd21d68ea91272f12c55940b593eff16c4fbd33f334c195e4368898cd23b1c42d95c4f8e2f8e0800183015f9094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba0c7c73113062a58bf7e0e82e2f72e370935e724fd5d83ed1e36822a2514f09e6da069f842a32725aa93e33e493bb5432d1b8763df8fea585ccaa8bb440713fa4a1bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc7c73113062a58bf7e0e82e2f72e370935e724fd5d83ed1e36822a2514f09e6d",
+                        "s" : "0x69f842a32725aa93e33e493bb5432d1b8763df8fea585ccaa8bb440713fa4a1b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x08de7de28e82852f20a033850a75ba283255db4273e536457c0e9eb025e2435a",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c183",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3e7d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d34g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g1v0Filler.json",
+            "sourceHash" : "2590f8cbb6026371189c76a78b9c077c8519be05b6a587902bf226fc7bb6aa36"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc183",
+                    "hash" : "0x62115515443d2a737c1413369a3216fc83fcd765e088d12364d52bca7e247c6d",
+                    "mixHash" : "0x989705ad5f768e2197709b6ef43535662129e6e70bf4dcc2cfb83392e8bdea0a",
+                    "nonce" : "0xc62c26e40a091e8b",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3",
+                    "stateRoot" : "0x5104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1df",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x08fa9447ccd55e266c60e36beded05601969bec59a09d2195b268cd88cc5653b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e1f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1dfa008fa9447ccd55e266c60e36beded05601969bec59a09d2195b268cd88cc5653ba03e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c1838203e880a0989705ad5f768e2197709b6ef43535662129e6e70bf4dcc2cfb83392e8bdea0a88c62c26e40a091e8bf8e2f8e0800183015f9094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba0c7c73113062a58bf7e0e82e2f72e370935e724fd5d83ed1e36822a2514f09e6da069f842a32725aa93e33e493bb5432d1b8763df8fea585ccaa8bb440713fa4a1bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc7c73113062a58bf7e0e82e2f72e370935e724fd5d83ed1e36822a2514f09e6d",
+                        "s" : "0x69f842a32725aa93e33e493bb5432d1b8763df8fea585ccaa8bb440713fa4a1b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x62115515443d2a737c1413369a3216fc83fcd765e088d12364d52bca7e247c6d",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c183",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3e7d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g2v0.json
index 2bbb2a36d..12854724f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g2v0.json
@@ -2,10 +2,10 @@
     "modexp_d34g2v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g2v0Filler.json",
-            "sourceHash" : "c2e0383d77e99d135d317b01b6db2e12ea373468108a47389c3dc58d33212273"
+            "sourceHash" : "8acba2dc99b21631e5d8e4470d91557a48457b00b88e7a1acb4ebfb516e85e0f"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xff46",
-                    "hash" : "0x1464689f178eb4bf6ec07e93eb2d6e0498448f1a1f15b288602e6bd1127bc869",
-                    "mixHash" : "0x3c6a4e5fe2a89e74afca70a06105d508daa52645d3b5f12c0d533cd1e0275b25",
-                    "nonce" : "0xe28e01bb0a409f72",
+                    "hash" : "0xca801e4c7ab0b4d3bc6a01b1f2a4c6065706c99475f00f68677188e3309863e1",
+                    "mixHash" : "0x7e5a0a12f32425920f1a5b4557bcb85500db71d598bec9e467ce235404d3c650",
+                    "nonce" : "0x1828ed533f4ba14e",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x1afca786aee7fd5617c31288c6ed495179a6d02231de6ad81d97fda6ab12422e",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x691aebcfb3b2cd7b4b44f962bae932de74bcac1aee4373b005166602c96cfc6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e1f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08648e906dc7d0b0e49515cafcffcc13c1d6da94e5943778ce11b0e713b30e9f3a0691aebcfb3b2cd7b4b44f962bae932de74bcac1aee4373b005166602c96cfc6ba01afca786aee7fd5617c31288c6ed495179a6d02231de6ad81d97fda6ab12422eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ff468203e880a03c6a4e5fe2a89e74afca70a06105d508daa52645d3b5f12c0d533cd1e0275b2588e28e01bb0a409f72f8e2f8e080018301adb094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ca090c266cea3a96ab537b47e56b4ef59033e2c7e36e65c3b69ebf1901d04499f98a02fed9f8e202bbff816078e8491135e940e5f7b7fd30adac13331cd8b4f43d082c0",
+                "rlp" : "0xf902e1f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08648e906dc7d0b0e49515cafcffcc13c1d6da94e5943778ce11b0e713b30e9f3a0691aebcfb3b2cd7b4b44f962bae932de74bcac1aee4373b005166602c96cfc6ba01afca786aee7fd5617c31288c6ed495179a6d02231de6ad81d97fda6ab12422eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ff468203e880a07e5a0a12f32425920f1a5b4557bcb85500db71d598bec9e467ce235404d3c650881828ed533f4ba14ef8e2f8e080018301adb094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ca090c266cea3a96ab537b47e56b4ef59033e2c7e36e65c3b69ebf1901d04499f98a02fed9f8e202bbff816078e8491135e940e5f7b7fd30adac13331cd8b4f43d082c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1464689f178eb4bf6ec07e93eb2d6e0498448f1a1f15b288602e6bd1127bc869",
+        "lastblockhash" : "0xca801e4c7ab0b4d3bc6a01b1f2a4c6065706c99475f00f68677188e3309863e1",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d34g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g2v0Filler.json",
+            "sourceHash" : "8acba2dc99b21631e5d8e4470d91557a48457b00b88e7a1acb4ebfb516e85e0f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc183",
+                    "hash" : "0x0aa43f98b92cd690461c59718fe3a0f571cd9050685fac72f2111bff1473388d",
+                    "mixHash" : "0x97e7b2fa00eff90d1c1e897a2ed56bc7f57fae90e07faa84738613898e679e96",
+                    "nonce" : "0x82adc6e15493865f",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3",
+                    "stateRoot" : "0x5104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1df",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x691aebcfb3b2cd7b4b44f962bae932de74bcac1aee4373b005166602c96cfc6b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e1f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1dfa0691aebcfb3b2cd7b4b44f962bae932de74bcac1aee4373b005166602c96cfc6ba03e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c1838203e880a097e7b2fa00eff90d1c1e897a2ed56bc7f57fae90e07faa84738613898e679e968882adc6e15493865ff8e2f8e080018301adb094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ca090c266cea3a96ab537b47e56b4ef59033e2c7e36e65c3b69ebf1901d04499f98a02fed9f8e202bbff816078e8491135e940e5f7b7fd30adac13331cd8b4f43d082c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90c266cea3a96ab537b47e56b4ef59033e2c7e36e65c3b69ebf1901d04499f98",
+                        "s" : "0x2fed9f8e202bbff816078e8491135e940e5f7b7fd30adac13331cd8b4f43d082",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0aa43f98b92cd690461c59718fe3a0f571cd9050685fac72f2111bff1473388d",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c183",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3e7d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d34g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g2v0Filler.json",
+            "sourceHash" : "8acba2dc99b21631e5d8e4470d91557a48457b00b88e7a1acb4ebfb516e85e0f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc183",
+                    "hash" : "0x46d8e5c12917dd6fbface962f00056ec970f498d5ba7574ec997880bef9da016",
+                    "mixHash" : "0x60f81159f4fc01117d3c0d67ed557f660bd2aad57a030b1ea3c455cf1578ad3c",
+                    "nonce" : "0x4a04bad86be8b3c1",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3",
+                    "stateRoot" : "0x5104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1df",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x691aebcfb3b2cd7b4b44f962bae932de74bcac1aee4373b005166602c96cfc6b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e1f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1dfa0691aebcfb3b2cd7b4b44f962bae932de74bcac1aee4373b005166602c96cfc6ba03e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c1838203e880a060f81159f4fc01117d3c0d67ed557f660bd2aad57a030b1ea3c455cf1578ad3c884a04bad86be8b3c1f8e2f8e080018301adb094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ca090c266cea3a96ab537b47e56b4ef59033e2c7e36e65c3b69ebf1901d04499f98a02fed9f8e202bbff816078e8491135e940e5f7b7fd30adac13331cd8b4f43d082c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90c266cea3a96ab537b47e56b4ef59033e2c7e36e65c3b69ebf1901d04499f98",
+                        "s" : "0x2fed9f8e202bbff816078e8491135e940e5f7b7fd30adac13331cd8b4f43d082",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x46d8e5c12917dd6fbface962f00056ec970f498d5ba7574ec997880bef9da016",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c183",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3e7d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g3v0.json
index b3180c9a6..3dad4fecb 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d34g3v0.json
@@ -2,10 +2,10 @@
     "modexp_d34g3v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g3v0Filler.json",
-            "sourceHash" : "4b7c7d4d7938e98124e0705fb3818442a77f95dc993a2ead459f9f24f58ddc77"
+            "sourceHash" : "dfa5bdfb587ada14fca487c9099d082e88c2a19b4a6a5fb258407d313b21c2c0"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xff46",
-                    "hash" : "0xde8ac8b686c91f9bda766ed111bfc543979ec1573194f15698c9900a302af4fe",
-                    "mixHash" : "0x67068f3dd436ae7af65eaa3967534855985aa6176686c70af2abab261f4b76fe",
-                    "nonce" : "0x41586ebc5d66bd17",
+                    "hash" : "0x17694c5a57f3b026e3f110e335a4367c3027d3ca519b707a7bba979ef624a791",
+                    "mixHash" : "0x2d2cd9b380701d0f954a669fa5b3af94c8dd5a5b597d505b813a9aba98f2d778",
+                    "nonce" : "0x7589a66c28ba11f5",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x1afca786aee7fd5617c31288c6ed495179a6d02231de6ad81d97fda6ab12422e",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xc7240d003192a8203294e1701b6f181e7c3baa1d0e11b1952f9132ced91f2698",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e1f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08648e906dc7d0b0e49515cafcffcc13c1d6da94e5943778ce11b0e713b30e9f3a0c7240d003192a8203294e1701b6f181e7c3baa1d0e11b1952f9132ced91f2698a01afca786aee7fd5617c31288c6ed495179a6d02231de6ad81d97fda6ab12422eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ff468203e880a067068f3dd436ae7af65eaa3967534855985aa6176686c70af2abab261f4b76fe8841586ebc5d66bd17f8e2f8e0800183030d4094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba06a8c343bbc3212fd8ba68e1ee22f483f2e1ead5db5396fe2ee297572387408a3a05aedbac637bac8f288e0df62c25d69d5b10d9854f3e78ab03118f3da3ef32aa9c0",
+                "rlp" : "0xf902e1f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08648e906dc7d0b0e49515cafcffcc13c1d6da94e5943778ce11b0e713b30e9f3a0c7240d003192a8203294e1701b6f181e7c3baa1d0e11b1952f9132ced91f2698a01afca786aee7fd5617c31288c6ed495179a6d02231de6ad81d97fda6ab12422eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ff468203e880a02d2cd9b380701d0f954a669fa5b3af94c8dd5a5b597d505b813a9aba98f2d778887589a66c28ba11f5f8e2f8e0800183030d4094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba06a8c343bbc3212fd8ba68e1ee22f483f2e1ead5db5396fe2ee297572387408a3a05aedbac637bac8f288e0df62c25d69d5b10d9854f3e78ab03118f3da3ef32aa9c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde8ac8b686c91f9bda766ed111bfc543979ec1573194f15698c9900a302af4fe",
+        "lastblockhash" : "0x17694c5a57f3b026e3f110e335a4367c3027d3ca519b707a7bba979ef624a791",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d34g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g3v0Filler.json",
+            "sourceHash" : "dfa5bdfb587ada14fca487c9099d082e88c2a19b4a6a5fb258407d313b21c2c0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc183",
+                    "hash" : "0x8af390a1e06938bea14b8f061798d6374ad8efc712cd91f7542ce74b21937362",
+                    "mixHash" : "0x52535f81bb84c357f6f3dcaf11ed3cd8dd66acd81da315046bc336c1dbf490d7",
+                    "nonce" : "0xa79c1f0cea6e4c10",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3",
+                    "stateRoot" : "0x5104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1df",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc7240d003192a8203294e1701b6f181e7c3baa1d0e11b1952f9132ced91f2698",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e1f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1dfa0c7240d003192a8203294e1701b6f181e7c3baa1d0e11b1952f9132ced91f2698a03e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c1838203e880a052535f81bb84c357f6f3dcaf11ed3cd8dd66acd81da315046bc336c1dbf490d788a79c1f0cea6e4c10f8e2f8e0800183030d4094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba06a8c343bbc3212fd8ba68e1ee22f483f2e1ead5db5396fe2ee297572387408a3a05aedbac637bac8f288e0df62c25d69d5b10d9854f3e78ab03118f3da3ef32aa9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a8c343bbc3212fd8ba68e1ee22f483f2e1ead5db5396fe2ee297572387408a3",
+                        "s" : "0x5aedbac637bac8f288e0df62c25d69d5b10d9854f3e78ab03118f3da3ef32aa9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8af390a1e06938bea14b8f061798d6374ad8efc712cd91f7542ce74b21937362",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c183",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3e7d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d34g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g3v0Filler.json",
+            "sourceHash" : "dfa5bdfb587ada14fca487c9099d082e88c2a19b4a6a5fb258407d313b21c2c0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc183",
+                    "hash" : "0x83b83621405cd742ec02277bcf505be5828d5db63e76414ff3422aa6cba6263b",
+                    "mixHash" : "0x112292887d46f895799efd27150a67a6575fe4cbdb0be3646c6151b4bab200b0",
+                    "nonce" : "0x4a2b0c64200669c3",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x3e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3",
+                    "stateRoot" : "0x5104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1df",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc7240d003192a8203294e1701b6f181e7c3baa1d0e11b1952f9132ced91f2698",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e1f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05104e96bd6a5327115cd163c9075e46bdb21d2cbc12eeec05b5867ffe121a1dfa0c7240d003192a8203294e1701b6f181e7c3baa1d0e11b1952f9132ced91f2698a03e94c6ebd81af2906f27630adafb91b61aba1acde22f17e2e0d520aff77008f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c1838203e880a0112292887d46f895799efd27150a67a6575fe4cbdb0be3646c6151b4bab200b0884a2b0c64200669c3f8e2f8e0800183030d4094100000000000000000000000000000000000000080b87f0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f1ba06a8c343bbc3212fd8ba68e1ee22f483f2e1ead5db5396fe2ee297572387408a3a05aedbac637bac8f288e0df62c25d69d5b10d9854f3e78ab03118f3da3ef32aa9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a8c343bbc3212fd8ba68e1ee22f483f2e1ead5db5396fe2ee297572387408a3",
+                        "s" : "0x5aedbac637bac8f288e0df62c25d69d5b10d9854f3e78ab03118f3da3ef32aa9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x83b83621405cd742ec02277bcf505be5828d5db63e76414ff3422aa6cba6263b",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c183",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3e7d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g0v0.json
index 4759af638..2a6ab4d8b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d35g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g0v0Filler.json",
             "sourceHash" : "984d91cdd7630119f2e68a6d4470fb118350c7302a04afa8017e47844d82eeea"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x010a4d",
-                    "hash" : "0x3ccb6e3ea8069fc4a92269910966d3a501b05003570a293152af4aefe645ca75",
-                    "mixHash" : "0xc426f8c4e9f33593fc8f7e505df92ab4abf863fab42eaf9000d7208d271cd4e7",
-                    "nonce" : "0x9c13d4b382357ee5",
+                    "hash" : "0x31aedb4a3d556881fa307030be02ca1fc83884fdec75440210cef940e19dcdca",
+                    "mixHash" : "0x34ed5cf282eef184c1da88043f9bca582adad473dbd2df10dbfdba933d83e8ca",
+                    "nonce" : "0x5607b757736438af",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x80490680cced70d64e44d1e4e903084f8d90e763b8a1a5b3f2b9d18d409c58d1",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x5a8c1324c20347d40a92122eaf27bf923bda58a23536b5a3992c54f41810c170",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902f8f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d9e15d30e24097f9afcf518cc0c4826fb119377d074e5e25e1c7ed006f703aa05a8c1324c20347d40a92122eaf27bf923bda58a23536b5a3992c54f41810c170a080490680cced70d64e44d1e4e903084f8d90e763b8a1a5b3f2b9d18d409c58d1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083010a4d8203e880a0c426f8c4e9f33593fc8f7e505df92ab4abf863fab42eaf9000d7208d271cd4e7889c13d4b382357ee5f8f8f8f680018405f5e10094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba0855a24f072d25cbd57932467b551a9ef5738c0835fb6cb7bd5ca8e7e3cd5b5d0a04721d86f1e55c1865df66425bf1f83aaf7ac74f6d94080bf8bb1bd71a07582f2c0",
+                "rlp" : "0xf902f8f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d9e15d30e24097f9afcf518cc0c4826fb119377d074e5e25e1c7ed006f703aa05a8c1324c20347d40a92122eaf27bf923bda58a23536b5a3992c54f41810c170a080490680cced70d64e44d1e4e903084f8d90e763b8a1a5b3f2b9d18d409c58d1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083010a4d8203e880a034ed5cf282eef184c1da88043f9bca582adad473dbd2df10dbfdba933d83e8ca885607b757736438aff8f8f8f680018405f5e10094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba0855a24f072d25cbd57932467b551a9ef5738c0835fb6cb7bd5ca8e7e3cd5b5d0a04721d86f1e55c1865df66425bf1f83aaf7ac74f6d94080bf8bb1bd71a07582f2c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ccb6e3ea8069fc4a92269910966d3a501b05003570a293152af4aefe645ca75",
+        "lastblockhash" : "0x31aedb4a3d556881fa307030be02ca1fc83884fdec75440210cef940e19dcdca",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d35g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g0v0Filler.json",
             "sourceHash" : "984d91cdd7630119f2e68a6d4470fb118350c7302a04afa8017e47844d82eeea"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xc71a",
-                    "hash" : "0x01d66c4c641ffb05149c10948de4c09b152d1facec13a384f0f9b7a4339ac29d",
-                    "mixHash" : "0x6e8ce24d25715a5d0903d2a8167d1cf9bd7207a258e8ae01121b635c9e100ede",
-                    "nonce" : "0xc4aae1e7fc01e2b1",
+                    "hash" : "0x0cad4d9c46370e1fda4359f65e51e33c8f79ee2212c0c11cee113de3f195f9d7",
+                    "mixHash" : "0x310ad422b5c3177fdd88917de6fc2a31bf115fc5a54edd8efcd91e0d9ef3573e",
+                    "nonce" : "0x593ac03212e2a886",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x17058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0x5a8c1324c20347d40a92122eaf27bf923bda58a23536b5a3992c54f41810c170",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902f7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0a05a8c1324c20347d40a92122eaf27bf923bda58a23536b5a3992c54f41810c170a017058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c71a8203e880a06e8ce24d25715a5d0903d2a8167d1cf9bd7207a258e8ae01121b635c9e100ede88c4aae1e7fc01e2b1f8f8f8f680018405f5e10094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba0855a24f072d25cbd57932467b551a9ef5738c0835fb6cb7bd5ca8e7e3cd5b5d0a04721d86f1e55c1865df66425bf1f83aaf7ac74f6d94080bf8bb1bd71a07582f2c0",
+                "rlp" : "0xf902f7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0a05a8c1324c20347d40a92122eaf27bf923bda58a23536b5a3992c54f41810c170a017058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c71a8203e880a0310ad422b5c3177fdd88917de6fc2a31bf115fc5a54edd8efcd91e0d9ef3573e88593ac03212e2a886f8f8f8f680018405f5e10094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba0855a24f072d25cbd57932467b551a9ef5738c0835fb6cb7bd5ca8e7e3cd5b5d0a04721d86f1e55c1865df66425bf1f83aaf7ac74f6d94080bf8bb1bd71a07582f2c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01d66c4c641ffb05149c10948de4c09b152d1facec13a384f0f9b7a4339ac29d",
+        "lastblockhash" : "0x0cad4d9c46370e1fda4359f65e51e33c8f79ee2212c0c11cee113de3f195f9d7",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d35g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g0v0Filler.json",
             "sourceHash" : "984d91cdd7630119f2e68a6d4470fb118350c7302a04afa8017e47844d82eeea"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xc71a",
-                    "hash" : "0xcb74c532f01408be2eb36f9f47ce137bcf286edbf79b33af3c8a296061f86792",
-                    "mixHash" : "0x60c0c049dccd6b02f1c647c305f815da413299f8938fd89595a9d6bbc48928d5",
-                    "nonce" : "0xe9fa91082b800643",
+                    "hash" : "0x2adcdc9e6b357a0892166171bf0eb9229c08cf79aae91ade3c811a149cd53853",
+                    "mixHash" : "0xaf16b359be994ffd62e6bac13a05379acbc1e00a3089a654943a0542cdba0bd6",
+                    "nonce" : "0x2904966adacbda64",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x17058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0x5a8c1324c20347d40a92122eaf27bf923bda58a23536b5a3992c54f41810c170",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902f7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0a05a8c1324c20347d40a92122eaf27bf923bda58a23536b5a3992c54f41810c170a017058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c71a8203e880a060c0c049dccd6b02f1c647c305f815da413299f8938fd89595a9d6bbc48928d588e9fa91082b800643f8f8f8f680018405f5e10094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba0855a24f072d25cbd57932467b551a9ef5738c0835fb6cb7bd5ca8e7e3cd5b5d0a04721d86f1e55c1865df66425bf1f83aaf7ac74f6d94080bf8bb1bd71a07582f2c0",
+                "rlp" : "0xf902f7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0a05a8c1324c20347d40a92122eaf27bf923bda58a23536b5a3992c54f41810c170a017058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c71a8203e880a0af16b359be994ffd62e6bac13a05379acbc1e00a3089a654943a0542cdba0bd6882904966adacbda64f8f8f8f680018405f5e10094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba0855a24f072d25cbd57932467b551a9ef5738c0835fb6cb7bd5ca8e7e3cd5b5d0a04721d86f1e55c1865df66425bf1f83aaf7ac74f6d94080bf8bb1bd71a07582f2c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb74c532f01408be2eb36f9f47ce137bcf286edbf79b33af3c8a296061f86792",
+        "lastblockhash" : "0x2adcdc9e6b357a0892166171bf0eb9229c08cf79aae91ade3c811a149cd53853",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g1v0.json
index 58b52848b..39846b0b8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g1v0.json
@@ -2,10 +2,10 @@
     "modexp_d35g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g1v0Filler.json",
-            "sourceHash" : "c535d15d3826f2a9337b6cb51ce8ec9afa73cc885861dbcda05c94a20ed6f11e"
+            "sourceHash" : "607bef03ec9b147995a50738785fea0083e49710587e9b9e6173eb28c3d9c843"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x010a4d",
-                    "hash" : "0x4035fb56a0a0711deef3b88dd591087fc932bba23b63a7fd55490d267b8ec589",
-                    "mixHash" : "0x5451e65a4ea8e9151cb72cf995525bc509b557397271f3a1b9c0ff64c0d08552",
-                    "nonce" : "0xc1c72aef1c645cf4",
+                    "hash" : "0x760a24b500e5dd2aed51d7335f0e7539599d5e951371cccece2d9f4c5de649ba",
+                    "mixHash" : "0xc4bf3b2798df9bb6fe7fc1298d2a1edd0df1e018b6c97494c09c35c78dd549d9",
+                    "nonce" : "0x4a371ea33fabe36c",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x80490680cced70d64e44d1e4e903084f8d90e763b8a1a5b3f2b9d18d409c58d1",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x595b719c2c622510c3fe852c0304ed0e2b14e198bd2086600fa2eebc86858a1b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902f7f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d9e15d30e24097f9afcf518cc0c4826fb119377d074e5e25e1c7ed006f703aa0595b719c2c622510c3fe852c0304ed0e2b14e198bd2086600fa2eebc86858a1ba080490680cced70d64e44d1e4e903084f8d90e763b8a1a5b3f2b9d18d409c58d1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083010a4d8203e880a05451e65a4ea8e9151cb72cf995525bc509b557397271f3a1b9c0ff64c0d0855288c1c72aef1c645cf4f8f7f8f5800183015f9094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca0377ec5d9cf8d3203006445aac1503a8b77684a49976158ac6e8670fc710c4acca0374ce9a58d664ba4cb93e3a70fc812fce644d6105db961b3e2abc198671add66c0",
+                "rlp" : "0xf902f7f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d9e15d30e24097f9afcf518cc0c4826fb119377d074e5e25e1c7ed006f703aa0595b719c2c622510c3fe852c0304ed0e2b14e198bd2086600fa2eebc86858a1ba080490680cced70d64e44d1e4e903084f8d90e763b8a1a5b3f2b9d18d409c58d1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083010a4d8203e880a0c4bf3b2798df9bb6fe7fc1298d2a1edd0df1e018b6c97494c09c35c78dd549d9884a371ea33fabe36cf8f7f8f5800183015f9094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca0377ec5d9cf8d3203006445aac1503a8b77684a49976158ac6e8670fc710c4acca0374ce9a58d664ba4cb93e3a70fc812fce644d6105db961b3e2abc198671add66c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4035fb56a0a0711deef3b88dd591087fc932bba23b63a7fd55490d267b8ec589",
+        "lastblockhash" : "0x760a24b500e5dd2aed51d7335f0e7539599d5e951371cccece2d9f4c5de649ba",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d35g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g1v0Filler.json",
+            "sourceHash" : "607bef03ec9b147995a50738785fea0083e49710587e9b9e6173eb28c3d9c843"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc71a",
+                    "hash" : "0xdb61565ff3f175a91c3d223695b330a9a346140f34df343426ee9d267b10f8b3",
+                    "mixHash" : "0x55fc2f72c70ba964902bce6fee296378270d584b349831306d0d0ba8e7df3d41",
+                    "nonce" : "0x05d8b918d44fee94",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x17058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9",
+                    "stateRoot" : "0x25f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x595b719c2c622510c3fe852c0304ed0e2b14e198bd2086600fa2eebc86858a1b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902f6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0a0595b719c2c622510c3fe852c0304ed0e2b14e198bd2086600fa2eebc86858a1ba017058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c71a8203e880a055fc2f72c70ba964902bce6fee296378270d584b349831306d0d0ba8e7df3d418805d8b918d44fee94f8f7f8f5800183015f9094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca0377ec5d9cf8d3203006445aac1503a8b77684a49976158ac6e8670fc710c4acca0374ce9a58d664ba4cb93e3a70fc812fce644d6105db961b3e2abc198671add66c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x377ec5d9cf8d3203006445aac1503a8b77684a49976158ac6e8670fc710c4acc",
+                        "s" : "0x374ce9a58d664ba4cb93e3a70fc812fce644d6105db961b3e2abc198671add66",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdb61565ff3f175a91c3d223695b330a9a346140f34df343426ee9d267b10f8b3",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c71a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f38e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d35g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g1v0Filler.json",
+            "sourceHash" : "607bef03ec9b147995a50738785fea0083e49710587e9b9e6173eb28c3d9c843"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc71a",
+                    "hash" : "0xdb2dfc7e87d30f9de620769bc0c27262acb7a79eb702af409e3ce4306412c3f2",
+                    "mixHash" : "0xc4febceb7a9bce18142359e5ae07f8c6f4597eb2d9ab51a93073e71c7f60cf31",
+                    "nonce" : "0xbb5bbdfe848539b8",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x17058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9",
+                    "stateRoot" : "0x25f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x595b719c2c622510c3fe852c0304ed0e2b14e198bd2086600fa2eebc86858a1b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902f6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0a0595b719c2c622510c3fe852c0304ed0e2b14e198bd2086600fa2eebc86858a1ba017058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c71a8203e880a0c4febceb7a9bce18142359e5ae07f8c6f4597eb2d9ab51a93073e71c7f60cf3188bb5bbdfe848539b8f8f7f8f5800183015f9094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca0377ec5d9cf8d3203006445aac1503a8b77684a49976158ac6e8670fc710c4acca0374ce9a58d664ba4cb93e3a70fc812fce644d6105db961b3e2abc198671add66c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x377ec5d9cf8d3203006445aac1503a8b77684a49976158ac6e8670fc710c4acc",
+                        "s" : "0x374ce9a58d664ba4cb93e3a70fc812fce644d6105db961b3e2abc198671add66",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdb2dfc7e87d30f9de620769bc0c27262acb7a79eb702af409e3ce4306412c3f2",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c71a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f38e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g2v0.json
index 5ac2a0afa..5ed3b35d2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g2v0.json
@@ -2,10 +2,10 @@
     "modexp_d35g2v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g2v0Filler.json",
-            "sourceHash" : "d23e70e32fdbe12f3847fb97ab518a989059d6a81ede2bb2f30cc08700736404"
+            "sourceHash" : "2eb10e2ff37921c92c4000bd166ef958cb703eafa2272c6dae39529ffb23d37a"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x010a4d",
-                    "hash" : "0x82dc98f5674a4be1430671503dd30c3a8cf4c2f3b168be29558292477e60e4dd",
-                    "mixHash" : "0x47a4c47ef83b295fa9cffd71446ef2330b3cae92637f7321688698e1a84f15cb",
-                    "nonce" : "0x7b499339a6068c89",
+                    "hash" : "0xff22012933801f9105e8c6e44f7f182f35ebf16f1b3712713d55e76820d3b08e",
+                    "mixHash" : "0x6c3f2fbb9006bb895b6be9bd6c2c84fce4be80c70f2978530816d6f4bccedda0",
+                    "nonce" : "0x417b61d474888597",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x80490680cced70d64e44d1e4e903084f8d90e763b8a1a5b3f2b9d18d409c58d1",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xff4fa223f8a6bfcc3bf9578108f86adaddf2008b766c7493a51f03da6fe3dca4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902f7f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d9e15d30e24097f9afcf518cc0c4826fb119377d074e5e25e1c7ed006f703aa0ff4fa223f8a6bfcc3bf9578108f86adaddf2008b766c7493a51f03da6fe3dca4a080490680cced70d64e44d1e4e903084f8d90e763b8a1a5b3f2b9d18d409c58d1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083010a4d8203e880a047a4c47ef83b295fa9cffd71446ef2330b3cae92637f7321688698e1a84f15cb887b499339a6068c89f8f7f8f580018301adb094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca0dc668bd9da0590a4da23787574005c391d5ee13bef5aeb3ca7f3a670854f58f9a021c17718c1a6f0a288b64574dbf35092c94f51dac9eb936c81fb7b2c16b4c80bc0",
+                "rlp" : "0xf902f7f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d9e15d30e24097f9afcf518cc0c4826fb119377d074e5e25e1c7ed006f703aa0ff4fa223f8a6bfcc3bf9578108f86adaddf2008b766c7493a51f03da6fe3dca4a080490680cced70d64e44d1e4e903084f8d90e763b8a1a5b3f2b9d18d409c58d1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083010a4d8203e880a06c3f2fbb9006bb895b6be9bd6c2c84fce4be80c70f2978530816d6f4bccedda088417b61d474888597f8f7f8f580018301adb094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca0dc668bd9da0590a4da23787574005c391d5ee13bef5aeb3ca7f3a670854f58f9a021c17718c1a6f0a288b64574dbf35092c94f51dac9eb936c81fb7b2c16b4c80bc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82dc98f5674a4be1430671503dd30c3a8cf4c2f3b168be29558292477e60e4dd",
+        "lastblockhash" : "0xff22012933801f9105e8c6e44f7f182f35ebf16f1b3712713d55e76820d3b08e",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d35g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g2v0Filler.json",
+            "sourceHash" : "2eb10e2ff37921c92c4000bd166ef958cb703eafa2272c6dae39529ffb23d37a"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc71a",
+                    "hash" : "0x543d4ee7786306118fc528e4e96caec16d00d9f5636dbf224970cf1e065a9006",
+                    "mixHash" : "0x21ce31850e129bad02a1a483f02c30658b66d81e17c3a038358db6e8afc7d019",
+                    "nonce" : "0x72e5a6ec077fd44c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x17058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9",
+                    "stateRoot" : "0x25f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xff4fa223f8a6bfcc3bf9578108f86adaddf2008b766c7493a51f03da6fe3dca4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902f6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0a0ff4fa223f8a6bfcc3bf9578108f86adaddf2008b766c7493a51f03da6fe3dca4a017058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c71a8203e880a021ce31850e129bad02a1a483f02c30658b66d81e17c3a038358db6e8afc7d0198872e5a6ec077fd44cf8f7f8f580018301adb094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca0dc668bd9da0590a4da23787574005c391d5ee13bef5aeb3ca7f3a670854f58f9a021c17718c1a6f0a288b64574dbf35092c94f51dac9eb936c81fb7b2c16b4c80bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc668bd9da0590a4da23787574005c391d5ee13bef5aeb3ca7f3a670854f58f9",
+                        "s" : "0x21c17718c1a6f0a288b64574dbf35092c94f51dac9eb936c81fb7b2c16b4c80b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x543d4ee7786306118fc528e4e96caec16d00d9f5636dbf224970cf1e065a9006",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c71a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f38e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d35g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g2v0Filler.json",
+            "sourceHash" : "2eb10e2ff37921c92c4000bd166ef958cb703eafa2272c6dae39529ffb23d37a"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc71a",
+                    "hash" : "0x8a726029d82697919ed836002454b0af1e56e4a78b5564138410edfb194071b1",
+                    "mixHash" : "0xa555e82736412f15b353f838a0844de2050923614cef39777a56c5f69fc046f9",
+                    "nonce" : "0xcb8675590f1cb53e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x17058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9",
+                    "stateRoot" : "0x25f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xff4fa223f8a6bfcc3bf9578108f86adaddf2008b766c7493a51f03da6fe3dca4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902f6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0a0ff4fa223f8a6bfcc3bf9578108f86adaddf2008b766c7493a51f03da6fe3dca4a017058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c71a8203e880a0a555e82736412f15b353f838a0844de2050923614cef39777a56c5f69fc046f988cb8675590f1cb53ef8f7f8f580018301adb094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca0dc668bd9da0590a4da23787574005c391d5ee13bef5aeb3ca7f3a670854f58f9a021c17718c1a6f0a288b64574dbf35092c94f51dac9eb936c81fb7b2c16b4c80bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc668bd9da0590a4da23787574005c391d5ee13bef5aeb3ca7f3a670854f58f9",
+                        "s" : "0x21c17718c1a6f0a288b64574dbf35092c94f51dac9eb936c81fb7b2c16b4c80b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8a726029d82697919ed836002454b0af1e56e4a78b5564138410edfb194071b1",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c71a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f38e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g3v0.json
index 3cc4e7529..c1497c637 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d35g3v0.json
@@ -2,10 +2,10 @@
     "modexp_d35g3v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g3v0Filler.json",
-            "sourceHash" : "26b34c3a57f4dc26e00440801de80ff145c1f55ee5065642ce18df6d49f0b756"
+            "sourceHash" : "1567e57c6973482b853c5b7a015b435a7356590127ab6c40d873f6ceb1feb422"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x010a4d",
-                    "hash" : "0x1a485294791adb76ca03095ef3f08de475a050951e6a15b42bbed6c8cd84d62a",
-                    "mixHash" : "0x2ef5d1bccf43ab115f7ab0885f6e6ce775e094df3217377ef3b665998970c890",
-                    "nonce" : "0x43f9c5140dc9fc57",
+                    "hash" : "0x4109411da74196de94779be98e8d79672b94623d6912f078fcd5c3aa3ea1a338",
+                    "mixHash" : "0x497f8cc8325deee09a52ff70f1052257ec69062f5910bf3e9d46bc43bf42e5f4",
+                    "nonce" : "0xe0931d75f29a14ef",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x80490680cced70d64e44d1e4e903084f8d90e763b8a1a5b3f2b9d18d409c58d1",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x95f88be8d6df034c9a77ed1088501dda35eda8332285255ed064ce62497402d2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902f7f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d9e15d30e24097f9afcf518cc0c4826fb119377d074e5e25e1c7ed006f703aa095f88be8d6df034c9a77ed1088501dda35eda8332285255ed064ce62497402d2a080490680cced70d64e44d1e4e903084f8d90e763b8a1a5b3f2b9d18d409c58d1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083010a4d8203e880a02ef5d1bccf43ab115f7ab0885f6e6ce775e094df3217377ef3b665998970c8908843f9c5140dc9fc57f8f7f8f5800183030d4094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca089f3ca27dd23773a05955eabbcbd7671e55d89cad488c1f577efa26470f0a13aa04de385c8de9189627dfc96e3cccbe8b060f68d7f20ab6c453dbb511c89e819f5c0",
+                "rlp" : "0xf902f7f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d9e15d30e24097f9afcf518cc0c4826fb119377d074e5e25e1c7ed006f703aa095f88be8d6df034c9a77ed1088501dda35eda8332285255ed064ce62497402d2a080490680cced70d64e44d1e4e903084f8d90e763b8a1a5b3f2b9d18d409c58d1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083010a4d8203e880a0497f8cc8325deee09a52ff70f1052257ec69062f5910bf3e9d46bc43bf42e5f488e0931d75f29a14eff8f7f8f5800183030d4094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca089f3ca27dd23773a05955eabbcbd7671e55d89cad488c1f577efa26470f0a13aa04de385c8de9189627dfc96e3cccbe8b060f68d7f20ab6c453dbb511c89e819f5c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a485294791adb76ca03095ef3f08de475a050951e6a15b42bbed6c8cd84d62a",
+        "lastblockhash" : "0x4109411da74196de94779be98e8d79672b94623d6912f078fcd5c3aa3ea1a338",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,5 +107,221 @@
                 }
             }
         }
+    },
+    "modexp_d35g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g3v0Filler.json",
+            "sourceHash" : "1567e57c6973482b853c5b7a015b435a7356590127ab6c40d873f6ceb1feb422"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc71a",
+                    "hash" : "0x41f41ed609f9b71ff52eec5dbd6c636d6511fac7bcf8e5b1f6499e26ec66615b",
+                    "mixHash" : "0xd755b055679f0697f4392f095d1c42d1e558234e5ff1d3abcf6cf2277e829bac",
+                    "nonce" : "0x122645a564fd9128",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x17058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9",
+                    "stateRoot" : "0x25f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x95f88be8d6df034c9a77ed1088501dda35eda8332285255ed064ce62497402d2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902f6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0a095f88be8d6df034c9a77ed1088501dda35eda8332285255ed064ce62497402d2a017058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c71a8203e880a0d755b055679f0697f4392f095d1c42d1e558234e5ff1d3abcf6cf2277e829bac88122645a564fd9128f8f7f8f5800183030d4094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca089f3ca27dd23773a05955eabbcbd7671e55d89cad488c1f577efa26470f0a13aa04de385c8de9189627dfc96e3cccbe8b060f68d7f20ab6c453dbb511c89e819f5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89f3ca27dd23773a05955eabbcbd7671e55d89cad488c1f577efa26470f0a13a",
+                        "s" : "0x4de385c8de9189627dfc96e3cccbe8b060f68d7f20ab6c453dbb511c89e819f5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x41f41ed609f9b71ff52eec5dbd6c636d6511fac7bcf8e5b1f6499e26ec66615b",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c71a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f38e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d35g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g3v0Filler.json",
+            "sourceHash" : "1567e57c6973482b853c5b7a015b435a7356590127ab6c40d873f6ceb1feb422"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xc71a",
+                    "hash" : "0x81be8185ff35c70d398f1935405ef09cd0a3e98678379b7bc3b01414c242db8f",
+                    "mixHash" : "0x0fdfa5276b69255259356e2f7fbb15f2dc780feb812f9e048ef4bf3a7c4dbda2",
+                    "nonce" : "0xa7bdee67cbc8ae7a",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x17058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9",
+                    "stateRoot" : "0x25f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x95f88be8d6df034c9a77ed1088501dda35eda8332285255ed064ce62497402d2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902f6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025f7bc0c1802f9ce29f7cb7e79878360cb41925f642a848ccf5607d4ca1e62f0a095f88be8d6df034c9a77ed1088501dda35eda8332285255ed064ce62497402d2a017058af26182057e55735a68f9368475d49c3992cc12d100802ca412e41c9de9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082c71a8203e880a00fdfa5276b69255259356e2f7fbb15f2dc780feb812f9e048ef4bf3a7c4dbda288a7bdee67cbc8ae7af8f7f8f5800183030d4094100000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca089f3ca27dd23773a05955eabbcbd7671e55d89cad488c1f577efa26470f0a13aa04de385c8de9189627dfc96e3cccbe8b060f68d7f20ab6c453dbb511c89e819f5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89f3ca27dd23773a05955eabbcbd7671e55d89cad488c1f577efa26470f0a13a",
+                        "s" : "0x4de385c8de9189627dfc96e3cccbe8b060f68d7f20ab6c453dbb511c89e819f5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x81be8185ff35c70d398f1935405ef09cd0a3e98678379b7bc3b01414c242db8f",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c71a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f38e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g0v0.json
index 8b81f36c0..965af38cf 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d36g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g0v0Filler.json",
             "sourceHash" : "b4d9d3eb8a1157748a83b3b813ceda98d2b3538bb018537ca0b8fb654b458e4d"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb984",
-                    "hash" : "0xac57cc2a14b388bafffdf5e5e6416e4bf8a90b6b194af7e27d73fb4804351c26",
-                    "mixHash" : "0xba131c3c367cd30beb48a8a185cec8ba5ea2449a0175e08759973d29f1380eb0",
-                    "nonce" : "0x951c272859ceb391",
+                    "hash" : "0x48a6c088fba251cb2fa077786a1bc541b4cc83fa6652c6752ec13261930e8efc",
+                    "mixHash" : "0x2cd18163ceae94a3f46f36d2f9794b98928c77614cdfd18467269ff3b4fd4da1",
+                    "nonce" : "0x49d6251b6331da19",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xa50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288a",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xd11e0a802f481419a97cc486e896445e39ba88e9ab6723e82b8180e0c23a64e4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4a0d11e0a802f481419a97cc486e896445e39ba88e9ab6723e82b8180e0c23a64e4a0a50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9848203e880a0ba131c3c367cd30beb48a8a185cec8ba5ea2449a0175e08759973d29f1380eb088951c272859ceb391f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b86000000000000000000000000000000000000000000000000000000000000000ff2a1e53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca06e28ef9dbb0c3e7c8e72e3f6d70868154470a71466fdab05423eac2dcfdcb7d5a0659f03c9906faa181acb5d1f9c07a1b8b070d284e44e845d044018be411c559cc0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4a0d11e0a802f481419a97cc486e896445e39ba88e9ab6723e82b8180e0c23a64e4a0a50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9848203e880a02cd18163ceae94a3f46f36d2f9794b98928c77614cdfd18467269ff3b4fd4da18849d6251b6331da19f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b86000000000000000000000000000000000000000000000000000000000000000ff2a1e53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca06e28ef9dbb0c3e7c8e72e3f6d70868154470a71466fdab05423eac2dcfdcb7d5a0659f03c9906faa181acb5d1f9c07a1b8b070d284e44e845d044018be411c559cc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac57cc2a14b388bafffdf5e5e6416e4bf8a90b6b194af7e27d73fb4804351c26",
+        "lastblockhash" : "0x48a6c088fba251cb2fa077786a1bc541b4cc83fa6652c6752ec13261930e8efc",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d36g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g0v0Filler.json",
             "sourceHash" : "b4d9d3eb8a1157748a83b3b813ceda98d2b3538bb018537ca0b8fb654b458e4d"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb984",
-                    "hash" : "0x50da2f5538b41833fab2e1ea84ebe0269d0fe9d1a23a43a67825963518fe94c8",
-                    "mixHash" : "0x11bca132ca80fc9c1caea16d4f36143ee597098f2c183163092762b99aa3d1b1",
-                    "nonce" : "0xc1c8bcb881cd1dfa",
+                    "hash" : "0xeb51a6bb48dbcbfdb1de1c887bdf0595e36646a1e3ee3d5ee42829e35a3d23ea",
+                    "mixHash" : "0xc3591d59262c71e6d1be2141a9894b4a0300a3ab80bed24d4a83c5bb85caf4d4",
+                    "nonce" : "0xa3088dc49c72945b",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xa50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288a",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0xd11e0a802f481419a97cc486e896445e39ba88e9ab6723e82b8180e0c23a64e4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4a0d11e0a802f481419a97cc486e896445e39ba88e9ab6723e82b8180e0c23a64e4a0a50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9848203e880a011bca132ca80fc9c1caea16d4f36143ee597098f2c183163092762b99aa3d1b188c1c8bcb881cd1dfaf8c4f8c280018405f5e10094100000000000000000000000000000000000000080b86000000000000000000000000000000000000000000000000000000000000000ff2a1e53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca06e28ef9dbb0c3e7c8e72e3f6d70868154470a71466fdab05423eac2dcfdcb7d5a0659f03c9906faa181acb5d1f9c07a1b8b070d284e44e845d044018be411c559cc0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4a0d11e0a802f481419a97cc486e896445e39ba88e9ab6723e82b8180e0c23a64e4a0a50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9848203e880a0c3591d59262c71e6d1be2141a9894b4a0300a3ab80bed24d4a83c5bb85caf4d488a3088dc49c72945bf8c4f8c280018405f5e10094100000000000000000000000000000000000000080b86000000000000000000000000000000000000000000000000000000000000000ff2a1e53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca06e28ef9dbb0c3e7c8e72e3f6d70868154470a71466fdab05423eac2dcfdcb7d5a0659f03c9906faa181acb5d1f9c07a1b8b070d284e44e845d044018be411c559cc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50da2f5538b41833fab2e1ea84ebe0269d0fe9d1a23a43a67825963518fe94c8",
+        "lastblockhash" : "0xeb51a6bb48dbcbfdb1de1c887bdf0595e36646a1e3ee3d5ee42829e35a3d23ea",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g1v0.json
index 7a73a41bf..1d37a9354 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g1v0.json
@@ -1,2 +1,218 @@
 {
+    "modexp_d36g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g1v0Filler.json",
+            "sourceHash" : "422e6d0ba9c4cbfe4efb8c05c845f4f8b4d12bd8f744f7a1df2dfbe4733de62f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb984",
+                    "hash" : "0x17addbbb937203f61256b18cb4318160efa32d2dc8a06f4fd219fec265ddc157",
+                    "mixHash" : "0x70ebaee73d5e0b1a5e4103b6193e0ac88883098ff34f08f9f232511a6aa163b1",
+                    "nonce" : "0xe02cdd6f6e847191",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xa50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288a",
+                    "stateRoot" : "0xff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2d0d3b763dee05a3ee9c75a048c2ed1cf0bdb921e6c68091106dc987a31219e7",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4a02d0d3b763dee05a3ee9c75a048c2ed1cf0bdb921e6c68091106dc987a31219e7a0a50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9848203e880a070ebaee73d5e0b1a5e4103b6193e0ac88883098ff34f08f9f232511a6aa163b188e02cdd6f6e847191f8c3f8c1800183015f9094100000000000000000000000000000000000000080b86000000000000000000000000000000000000000000000000000000000000000ff2a1e53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0426ab070e5284162448f959c45f77868a37c04e957eda24ead38a76771824426a072e4a1e3d0c7d9beae0d924484225f0bbb381c1dbf6fbe698d801495367a2fc0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x426ab070e5284162448f959c45f77868a37c04e957eda24ead38a76771824426",
+                        "s" : "0x72e4a1e3d0c7d9beae0d924484225f0bbb381c1dbf6fbe698d801495367a2fc0",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x17addbbb937203f61256b18cb4318160efa32d2dc8a06f4fd219fec265ddc157",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b984",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f467c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d36g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g1v0Filler.json",
+            "sourceHash" : "422e6d0ba9c4cbfe4efb8c05c845f4f8b4d12bd8f744f7a1df2dfbe4733de62f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb984",
+                    "hash" : "0xc592858054821ef62308c605b77886bc8a2e32512133eeebd0d7988d9c71e2d5",
+                    "mixHash" : "0x0ece56bbb941976309fb2ed30d29af850611da399b9865fd5aceb11440f1a164",
+                    "nonce" : "0x8b242b4b6a8698b7",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xa50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288a",
+                    "stateRoot" : "0xff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2d0d3b763dee05a3ee9c75a048c2ed1cf0bdb921e6c68091106dc987a31219e7",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4a02d0d3b763dee05a3ee9c75a048c2ed1cf0bdb921e6c68091106dc987a31219e7a0a50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9848203e880a00ece56bbb941976309fb2ed30d29af850611da399b9865fd5aceb11440f1a164888b242b4b6a8698b7f8c3f8c1800183015f9094100000000000000000000000000000000000000080b86000000000000000000000000000000000000000000000000000000000000000ff2a1e53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0426ab070e5284162448f959c45f77868a37c04e957eda24ead38a76771824426a072e4a1e3d0c7d9beae0d924484225f0bbb381c1dbf6fbe698d801495367a2fc0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x426ab070e5284162448f959c45f77868a37c04e957eda24ead38a76771824426",
+                        "s" : "0x72e4a1e3d0c7d9beae0d924484225f0bbb381c1dbf6fbe698d801495367a2fc0",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc592858054821ef62308c605b77886bc8a2e32512133eeebd0d7988d9c71e2d5",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b984",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f467c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g2v0.json
index 7a73a41bf..9d279f65f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g2v0.json
@@ -1,2 +1,218 @@
 {
+    "modexp_d36g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g2v0Filler.json",
+            "sourceHash" : "9a36bb93810607bae50735959f5d428fa3d849d2cab6f5ddbffd4e971fdde017"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb984",
+                    "hash" : "0xf0045489914cd8c336b96366bc03ea0a7872b41de50fededfc8d02439fefa455",
+                    "mixHash" : "0x877aaad538fe58a93b961c2a5ae1432859870404f674e6a663c63d9d32b2aff5",
+                    "nonce" : "0x9e1c4773d5a04c95",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xa50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288a",
+                    "stateRoot" : "0xff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2f576d3cd455d74b4664f51629b0d08513738e223fa1758d7a64cb5988986505",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4a02f576d3cd455d74b4664f51629b0d08513738e223fa1758d7a64cb5988986505a0a50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9848203e880a0877aaad538fe58a93b961c2a5ae1432859870404f674e6a663c63d9d32b2aff5889e1c4773d5a04c95f8c3f8c180018301adb094100000000000000000000000000000000000000080b86000000000000000000000000000000000000000000000000000000000000000ff2a1e53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca030943a3b00c38b194c60bc4d3af012147ff1f5cd32719458ef247ebe05baf4c5a03838a7266f4f4c86dd57ce8bd936e36ad918c1899fb861118a6190b50d8cfa63c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x30943a3b00c38b194c60bc4d3af012147ff1f5cd32719458ef247ebe05baf4c5",
+                        "s" : "0x3838a7266f4f4c86dd57ce8bd936e36ad918c1899fb861118a6190b50d8cfa63",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf0045489914cd8c336b96366bc03ea0a7872b41de50fededfc8d02439fefa455",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b984",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f467c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d36g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g2v0Filler.json",
+            "sourceHash" : "9a36bb93810607bae50735959f5d428fa3d849d2cab6f5ddbffd4e971fdde017"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb984",
+                    "hash" : "0x48185cb251825a94840120228aecae874fe8375617a7f2f52c2faf956fbb57a9",
+                    "mixHash" : "0x213061b6d3e504f277b4fe63a514c1b7eac8c886ed1cb8798e8b56892485e2e4",
+                    "nonce" : "0x45f01102ca4c81e5",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xa50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288a",
+                    "stateRoot" : "0xff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2f576d3cd455d74b4664f51629b0d08513738e223fa1758d7a64cb5988986505",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4a02f576d3cd455d74b4664f51629b0d08513738e223fa1758d7a64cb5988986505a0a50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9848203e880a0213061b6d3e504f277b4fe63a514c1b7eac8c886ed1cb8798e8b56892485e2e48845f01102ca4c81e5f8c3f8c180018301adb094100000000000000000000000000000000000000080b86000000000000000000000000000000000000000000000000000000000000000ff2a1e53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca030943a3b00c38b194c60bc4d3af012147ff1f5cd32719458ef247ebe05baf4c5a03838a7266f4f4c86dd57ce8bd936e36ad918c1899fb861118a6190b50d8cfa63c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x30943a3b00c38b194c60bc4d3af012147ff1f5cd32719458ef247ebe05baf4c5",
+                        "s" : "0x3838a7266f4f4c86dd57ce8bd936e36ad918c1899fb861118a6190b50d8cfa63",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x48185cb251825a94840120228aecae874fe8375617a7f2f52c2faf956fbb57a9",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b984",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f467c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g3v0.json
index 7a73a41bf..ba72e6d53 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d36g3v0.json
@@ -1,2 +1,218 @@
 {
+    "modexp_d36g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g3v0Filler.json",
+            "sourceHash" : "62db3d1160195747681cde0bc333d5d0fad34e86039272ab4cf75e59e69e083d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb984",
+                    "hash" : "0xeec8eaa2caa0406a1cf7b8885d6b7bf4215d10d3e60c22d7c42857f8d927d792",
+                    "mixHash" : "0xc084722384f212202d598eaacaf3ac54355412624cb2ec0044b3e09ae790e706",
+                    "nonce" : "0x31025611e618e3ba",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xa50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288a",
+                    "stateRoot" : "0xff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xcf4b5f563c2203733f1fe18b32c6a752988e588b7956eabd54c9e0b54ea6f152",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4a0cf4b5f563c2203733f1fe18b32c6a752988e588b7956eabd54c9e0b54ea6f152a0a50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9848203e880a0c084722384f212202d598eaacaf3ac54355412624cb2ec0044b3e09ae790e7068831025611e618e3baf8c3f8c1800183030d4094100000000000000000000000000000000000000080b86000000000000000000000000000000000000000000000000000000000000000ff2a1e53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca08e6007618a220034b7c376cb86f04a6ed14247ec55664b2a3ce90c7304516864a0563fb96f53a931a8dceb6e62f23a5a49627d296562397dc9810853496fde0e3ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8e6007618a220034b7c376cb86f04a6ed14247ec55664b2a3ce90c7304516864",
+                        "s" : "0x563fb96f53a931a8dceb6e62f23a5a49627d296562397dc9810853496fde0e3a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xeec8eaa2caa0406a1cf7b8885d6b7bf4215d10d3e60c22d7c42857f8d927d792",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b984",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f467c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d36g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g3v0Filler.json",
+            "sourceHash" : "62db3d1160195747681cde0bc333d5d0fad34e86039272ab4cf75e59e69e083d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb984",
+                    "hash" : "0x01062962b7fc87f13613dadace804f867362829771733b331ae13961478638bd",
+                    "mixHash" : "0x30a7c93cbc7512d73e15abdd26d209a0b227a53ebd996ea059b14cf876c0132e",
+                    "nonce" : "0x0760e01ab1af2159",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xa50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288a",
+                    "stateRoot" : "0xff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xcf4b5f563c2203733f1fe18b32c6a752988e588b7956eabd54c9e0b54ea6f152",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c2f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff30daf75f98519baeae0d478b1d16e140f0b72b054ec0e1ef0e54bdec5100a4a0cf4b5f563c2203733f1fe18b32c6a752988e588b7956eabd54c9e0b54ea6f152a0a50f515e2263da2dd0adfde8e956457223782a9e526d774d08e3a0c8ae9b288ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9848203e880a030a7c93cbc7512d73e15abdd26d209a0b227a53ebd996ea059b14cf876c0132e880760e01ab1af2159f8c3f8c1800183030d4094100000000000000000000000000000000000000080b86000000000000000000000000000000000000000000000000000000000000000ff2a1e53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca08e6007618a220034b7c376cb86f04a6ed14247ec55664b2a3ce90c7304516864a0563fb96f53a931a8dceb6e62f23a5a49627d296562397dc9810853496fde0e3ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8e6007618a220034b7c376cb86f04a6ed14247ec55664b2a3ce90c7304516864",
+                        "s" : "0x563fb96f53a931a8dceb6e62f23a5a49627d296562397dc9810853496fde0e3a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x01062962b7fc87f13613dadace804f867362829771733b331ae13961478638bd",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b984",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f467c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g0v0.json
index 82c64ab72..f14245bbe 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d3g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g0v0Filler.json",
             "sourceHash" : "7fe8771742db0de754fdb0ab4cb9ebdac985f820edd75f8689a5de5da01f11e4"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf8b2",
-                    "hash" : "0x14262dc4f7552b38d2b6a51a604e52fb50dbf58eb4f831fc124ee94ac23e2c7b",
-                    "mixHash" : "0xcfe6915c192025e516c58ffaec8b0cfaaa4d74b88abbc8754de1464b77168fdb",
-                    "nonce" : "0x094dbb6bcb0e7900",
+                    "hash" : "0xc8d90dbb13114bdb4e1fb268d547b3310a3b12e0f85d9ef3f318b4dad0db5d05",
+                    "mixHash" : "0xe996a1e3a27f3ffa5207405730b7681ad5d5fc9da27f72a267af35764d94e4de",
+                    "nonce" : "0x7bcf88a621f7bbb4",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x9d503bb90653c6fd8d0ef0085376e6dac875af0049cfc9c010ce89ad8cf97e0d",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xdca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee260c088b10bf3f42c64af1932e6387ae8ac37f1c1ff89fbce77c9ab384d2f7a0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a09d503bb90653c6fd8d0ef0085376e6dac875af0049cfc9c010ce89ad8cf97e0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f8b28203e880a0cfe6915c192025e516c58ffaec8b0cfaaa4d74b88abbc8754de1464b77168fdb88094dbb6bcb0e7900f8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
+                "rlp" : "0xf902e7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee260c088b10bf3f42c64af1932e6387ae8ac37f1c1ff89fbce77c9ab384d2f7a0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a09d503bb90653c6fd8d0ef0085376e6dac875af0049cfc9c010ce89ad8cf97e0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f8b28203e880a0e996a1e3a27f3ffa5207405730b7681ad5d5fc9da27f72a267af35764d94e4de887bcf88a621f7bbb4f8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x14262dc4f7552b38d2b6a51a604e52fb50dbf58eb4f831fc124ee94ac23e2c7b",
+        "lastblockhash" : "0xc8d90dbb13114bdb4e1fb268d547b3310a3b12e0f85d9ef3f318b4dad0db5d05",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d3g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g0v0Filler.json",
             "sourceHash" : "7fe8771742db0de754fdb0ab4cb9ebdac985f820edd75f8689a5de5da01f11e4"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xbb1a",
-                    "hash" : "0x7d99f7c7d2224f3b1b9c8039cd03d11f619dae3b0521e6e88e135e4c33172e26",
-                    "mixHash" : "0xd2908f7c771fad300a1291c6ce10a0200807fac192bd4acec930facaa786dcdf",
-                    "nonce" : "0xe639f070a6fd7dc6",
+                    "hash" : "0xbb41df6c8b287120511836184e72d2256fd9e7105a2c8c12143319cef922f6f0",
+                    "mixHash" : "0x2745aaf47f9479529fa7764731b68500b3add7c10abde1411b5b38de2367d742",
+                    "nonce" : "0xcd5aa96d0c950aaa",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xb9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0xdca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a0d2908f7c771fad300a1291c6ce10a0200807fac192bd4acec930facaa786dcdf88e639f070a6fd7dc6f8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
+                "rlp" : "0xf902e7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a02745aaf47f9479529fa7764731b68500b3add7c10abde1411b5b38de2367d74288cd5aa96d0c950aaaf8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d99f7c7d2224f3b1b9c8039cd03d11f619dae3b0521e6e88e135e4c33172e26",
+        "lastblockhash" : "0xbb41df6c8b287120511836184e72d2256fd9e7105a2c8c12143319cef922f6f0",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d3g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g0v0Filler.json",
             "sourceHash" : "7fe8771742db0de754fdb0ab4cb9ebdac985f820edd75f8689a5de5da01f11e4"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xbb1a",
-                    "hash" : "0x1fcd0b7157512f004790a6f363e2fe5aaa84b8ede1066adfdf0104c26040e213",
-                    "mixHash" : "0xc1949c4f725d7246d2014e7488345fe43d80b63cc86661304659de5ed0fe99c6",
-                    "nonce" : "0x46d275c7aa70616e",
+                    "hash" : "0xc3432f0ce5459d38c358a5da8eba68a29338e8569a71ed44c5075c9256c35fed",
+                    "mixHash" : "0x8dff7e751c9341ce569096c24e0c3078c19da26d71233a313cc2116ec2687ec6",
+                    "nonce" : "0xe13793e788d3acdb",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xb9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0xdca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a0c1949c4f725d7246d2014e7488345fe43d80b63cc86661304659de5ed0fe99c68846d275c7aa70616ef8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
+                "rlp" : "0xf902e7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a08dff7e751c9341ce569096c24e0c3078c19da26d71233a313cc2116ec2687ec688e13793e788d3acdbf8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1fcd0b7157512f004790a6f363e2fe5aaa84b8ede1066adfdf0104c26040e213",
+        "lastblockhash" : "0xc3432f0ce5459d38c358a5da8eba68a29338e8569a71ed44c5075c9256c35fed",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g1v0.json
index 7a73a41bf..e7f0224c0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g1v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d3g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g1v0Filler.json",
+            "sourceHash" : "7812b14efb4b40326c9145b62dfb6fcc3748211b2b81294c2f146258454ceb3c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf8b2",
+                    "hash" : "0xbb36a0528cc00a2e5eee915f6d69a584f3ca02104ec0666dfe769e768dab55c8",
+                    "mixHash" : "0xdef1689a0b94d61c3438d49ba33e0f2a6ea78ac6a3cdd49531226884b3947d31",
+                    "nonce" : "0xb99e642ad39c0410",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9d503bb90653c6fd8d0ef0085376e6dac875af0049cfc9c010ce89ad8cf97e0d",
+                    "stateRoot" : "0xee260c088b10bf3f42c64af1932e6387ae8ac37f1c1ff89fbce77c9ab384d2f7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9cccffec1dfee87b99a14c9d84c3cf72e3628471fab0871fd1203ebc5bbec524",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee260c088b10bf3f42c64af1932e6387ae8ac37f1c1ff89fbce77c9ab384d2f7a09cccffec1dfee87b99a14c9d84c3cf72e3628471fab0871fd1203ebc5bbec524a09d503bb90653c6fd8d0ef0085376e6dac875af0049cfc9c010ce89ad8cf97e0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f8b28203e880a0def1689a0b94d61c3438d49ba33e0f2a6ea78ac6a3cdd49531226884b3947d3188b99e642ad39c0410f8e7f8e5800183015f9094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca085d761b97726b434c46e9cc8657ca72974ab3affd64a5d03034b09e6775314afa071d227b093c4ca553d5aaac40cd8b1d3e3340f6a1aec09e81ee02ad76ec5d26ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x85d761b97726b434c46e9cc8657ca72974ab3affd64a5d03034b09e6775314af",
+                        "s" : "0x71d227b093c4ca553d5aaac40cd8b1d3e3340f6a1aec09e81ee02ad76ec5d26a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbb36a0528cc00a2e5eee915f6d69a584f3ca02104ec0666dfe769e768dab55c8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf8b2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f074e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d3g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g1v0Filler.json",
+            "sourceHash" : "7812b14efb4b40326c9145b62dfb6fcc3748211b2b81294c2f146258454ceb3c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbb1a",
+                    "hash" : "0x0d709bd7b9a8714d3b0f20d6168499032bf97d0c7c0f5d0c083935da255b3301",
+                    "mixHash" : "0x707d0e70967a1d631249b3e2e492472f9085ce4bef332eb985c274d35d45d39e",
+                    "nonce" : "0x73a7dffadd8d0a85",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xb9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294",
+                    "stateRoot" : "0xc840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9cccffec1dfee87b99a14c9d84c3cf72e3628471fab0871fd1203ebc5bbec524",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa09cccffec1dfee87b99a14c9d84c3cf72e3628471fab0871fd1203ebc5bbec524a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a0707d0e70967a1d631249b3e2e492472f9085ce4bef332eb985c274d35d45d39e8873a7dffadd8d0a85f8e7f8e5800183015f9094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca085d761b97726b434c46e9cc8657ca72974ab3affd64a5d03034b09e6775314afa071d227b093c4ca553d5aaac40cd8b1d3e3340f6a1aec09e81ee02ad76ec5d26ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x85d761b97726b434c46e9cc8657ca72974ab3affd64a5d03034b09e6775314af",
+                        "s" : "0x71d227b093c4ca553d5aaac40cd8b1d3e3340f6a1aec09e81ee02ad76ec5d26a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0d709bd7b9a8714d3b0f20d6168499032bf97d0c7c0f5d0c083935da255b3301",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4bb1a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f44e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d3g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g1v0Filler.json",
+            "sourceHash" : "7812b14efb4b40326c9145b62dfb6fcc3748211b2b81294c2f146258454ceb3c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbb1a",
+                    "hash" : "0xf44d7f289464cbee9f69a315e459bb9d24856f01dbe939535670620b9debdfee",
+                    "mixHash" : "0xe447a4d6585378408f59c880b4e7652d0c1573701b06c8817ba52e7bbaa2459a",
+                    "nonce" : "0x1cbe196f8d4c4283",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xb9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294",
+                    "stateRoot" : "0xc840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9cccffec1dfee87b99a14c9d84c3cf72e3628471fab0871fd1203ebc5bbec524",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa09cccffec1dfee87b99a14c9d84c3cf72e3628471fab0871fd1203ebc5bbec524a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a0e447a4d6585378408f59c880b4e7652d0c1573701b06c8817ba52e7bbaa2459a881cbe196f8d4c4283f8e7f8e5800183015f9094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca085d761b97726b434c46e9cc8657ca72974ab3affd64a5d03034b09e6775314afa071d227b093c4ca553d5aaac40cd8b1d3e3340f6a1aec09e81ee02ad76ec5d26ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x85d761b97726b434c46e9cc8657ca72974ab3affd64a5d03034b09e6775314af",
+                        "s" : "0x71d227b093c4ca553d5aaac40cd8b1d3e3340f6a1aec09e81ee02ad76ec5d26a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf44d7f289464cbee9f69a315e459bb9d24856f01dbe939535670620b9debdfee",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4bb1a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f44e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g2v0.json
index 7a73a41bf..80b872ec9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g2v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d3g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g2v0Filler.json",
+            "sourceHash" : "d07f3ee58d2a26e362c99bf16655258bf30ed6a7e5a51f477bbba75b87700120"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf8b2",
+                    "hash" : "0xd362565d5be2462a8a0cff0152f28cbb0aa3d757a2779e216152200339e7bf7f",
+                    "mixHash" : "0x4f6317c38d6663d166a8289cf5d08aa6b1e2ff9edf61d4bf037357a4db77aa62",
+                    "nonce" : "0xf56bf3f8583456bc",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9d503bb90653c6fd8d0ef0085376e6dac875af0049cfc9c010ce89ad8cf97e0d",
+                    "stateRoot" : "0xee260c088b10bf3f42c64af1932e6387ae8ac37f1c1ff89fbce77c9ab384d2f7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa8ba5259d9b8f08d65945a6f3d3326d99f9b4b908602eb50c7affeb751b67317",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee260c088b10bf3f42c64af1932e6387ae8ac37f1c1ff89fbce77c9ab384d2f7a0a8ba5259d9b8f08d65945a6f3d3326d99f9b4b908602eb50c7affeb751b67317a09d503bb90653c6fd8d0ef0085376e6dac875af0049cfc9c010ce89ad8cf97e0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f8b28203e880a04f6317c38d6663d166a8289cf5d08aa6b1e2ff9edf61d4bf037357a4db77aa6288f56bf3f8583456bcf8e7f8e580018301adb094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ba0fbbdd8e146397ef46b08b16d98aa84175d449c6d185df3b6d34c3b9304e6eee9a04b98523ab42bbcae70d66a4560f2fc9ab58efd51191133a1fba3f5ec14f85231c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfbbdd8e146397ef46b08b16d98aa84175d449c6d185df3b6d34c3b9304e6eee9",
+                        "s" : "0x4b98523ab42bbcae70d66a4560f2fc9ab58efd51191133a1fba3f5ec14f85231",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd362565d5be2462a8a0cff0152f28cbb0aa3d757a2779e216152200339e7bf7f",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf8b2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f074e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d3g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g2v0Filler.json",
+            "sourceHash" : "d07f3ee58d2a26e362c99bf16655258bf30ed6a7e5a51f477bbba75b87700120"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbb1a",
+                    "hash" : "0x5bc867442157dab18884c6c62a512e737290a32ef6556ba939f709e9e4a388d3",
+                    "mixHash" : "0xd09e5bdb9f504ec37c15ffe8a9f33778a1fa4863231b05f4a44cd6c60a47298e",
+                    "nonce" : "0x438a011b8cee7b6e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xb9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294",
+                    "stateRoot" : "0xc840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa8ba5259d9b8f08d65945a6f3d3326d99f9b4b908602eb50c7affeb751b67317",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa0a8ba5259d9b8f08d65945a6f3d3326d99f9b4b908602eb50c7affeb751b67317a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a0d09e5bdb9f504ec37c15ffe8a9f33778a1fa4863231b05f4a44cd6c60a47298e88438a011b8cee7b6ef8e7f8e580018301adb094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ba0fbbdd8e146397ef46b08b16d98aa84175d449c6d185df3b6d34c3b9304e6eee9a04b98523ab42bbcae70d66a4560f2fc9ab58efd51191133a1fba3f5ec14f85231c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfbbdd8e146397ef46b08b16d98aa84175d449c6d185df3b6d34c3b9304e6eee9",
+                        "s" : "0x4b98523ab42bbcae70d66a4560f2fc9ab58efd51191133a1fba3f5ec14f85231",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5bc867442157dab18884c6c62a512e737290a32ef6556ba939f709e9e4a388d3",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4bb1a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f44e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d3g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g2v0Filler.json",
+            "sourceHash" : "d07f3ee58d2a26e362c99bf16655258bf30ed6a7e5a51f477bbba75b87700120"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbb1a",
+                    "hash" : "0xcd355818b5a8277cd9ca00bd719d6e47e657e9c0e4544440bd97ebb8f5ec954d",
+                    "mixHash" : "0x3a80cb3c2979a729ca37df86dc8b8c85a23b1a74e846a8f8437b48a79e8b8a03",
+                    "nonce" : "0x9c21ad07ea49b817",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xb9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294",
+                    "stateRoot" : "0xc840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa8ba5259d9b8f08d65945a6f3d3326d99f9b4b908602eb50c7affeb751b67317",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa0a8ba5259d9b8f08d65945a6f3d3326d99f9b4b908602eb50c7affeb751b67317a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a03a80cb3c2979a729ca37df86dc8b8c85a23b1a74e846a8f8437b48a79e8b8a03889c21ad07ea49b817f8e7f8e580018301adb094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ba0fbbdd8e146397ef46b08b16d98aa84175d449c6d185df3b6d34c3b9304e6eee9a04b98523ab42bbcae70d66a4560f2fc9ab58efd51191133a1fba3f5ec14f85231c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfbbdd8e146397ef46b08b16d98aa84175d449c6d185df3b6d34c3b9304e6eee9",
+                        "s" : "0x4b98523ab42bbcae70d66a4560f2fc9ab58efd51191133a1fba3f5ec14f85231",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcd355818b5a8277cd9ca00bd719d6e47e657e9c0e4544440bd97ebb8f5ec954d",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4bb1a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f44e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g3v0.json
index 7a73a41bf..d3edd83a8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g3v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d3g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g3v0Filler.json",
+            "sourceHash" : "ec0492a0f0b9c5f9122942b627b7e8aafc67236e920adde62341b8fd34e24867"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf8b2",
+                    "hash" : "0xc164b025c24762b889ec2fde2ec77ce2c9b91389b74db61a9d7bb781aa5d279a",
+                    "mixHash" : "0xf9ef472ab0d6b35562f298874d85e771afbc02c7c1e752cc177f23d96c613590",
+                    "nonce" : "0x624cd65929bf906e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9d503bb90653c6fd8d0ef0085376e6dac875af0049cfc9c010ce89ad8cf97e0d",
+                    "stateRoot" : "0xee260c088b10bf3f42c64af1932e6387ae8ac37f1c1ff89fbce77c9ab384d2f7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1897eabb3785d6863150cebed1488159d248db87d79b5664195fc580cf75c270",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee260c088b10bf3f42c64af1932e6387ae8ac37f1c1ff89fbce77c9ab384d2f7a01897eabb3785d6863150cebed1488159d248db87d79b5664195fc580cf75c270a09d503bb90653c6fd8d0ef0085376e6dac875af0049cfc9c010ce89ad8cf97e0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f8b28203e880a0f9ef472ab0d6b35562f298874d85e771afbc02c7c1e752cc177f23d96c61359088624cd65929bf906ef8e7f8e5800183030d4094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0b1a892bf456c1ff1f73369584b0eef4209f080302911d37b6d424f0e3b2a6e88a04150d03d667884ae7106a8a3e2b3d1d6684bce3c23486f6455a88ea683148401c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1a892bf456c1ff1f73369584b0eef4209f080302911d37b6d424f0e3b2a6e88",
+                        "s" : "0x4150d03d667884ae7106a8a3e2b3d1d6684bce3c23486f6455a88ea683148401",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc164b025c24762b889ec2fde2ec77ce2c9b91389b74db61a9d7bb781aa5d279a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf8b2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f074e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d3g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g3v0Filler.json",
+            "sourceHash" : "ec0492a0f0b9c5f9122942b627b7e8aafc67236e920adde62341b8fd34e24867"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbb1a",
+                    "hash" : "0xb9b087f9037927ea21f8d9ee525302d3b67de0315d0b10783632d0d7bd8ae1e5",
+                    "mixHash" : "0xd52abfbef28a82c80285350d199eac56299c3f3497fed65e5b7dd8de3d804e44",
+                    "nonce" : "0x7ad5789b4838ca36",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xb9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294",
+                    "stateRoot" : "0xc840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1897eabb3785d6863150cebed1488159d248db87d79b5664195fc580cf75c270",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa01897eabb3785d6863150cebed1488159d248db87d79b5664195fc580cf75c270a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a0d52abfbef28a82c80285350d199eac56299c3f3497fed65e5b7dd8de3d804e44887ad5789b4838ca36f8e7f8e5800183030d4094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0b1a892bf456c1ff1f73369584b0eef4209f080302911d37b6d424f0e3b2a6e88a04150d03d667884ae7106a8a3e2b3d1d6684bce3c23486f6455a88ea683148401c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1a892bf456c1ff1f73369584b0eef4209f080302911d37b6d424f0e3b2a6e88",
+                        "s" : "0x4150d03d667884ae7106a8a3e2b3d1d6684bce3c23486f6455a88ea683148401",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb9b087f9037927ea21f8d9ee525302d3b67de0315d0b10783632d0d7bd8ae1e5",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4bb1a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f44e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d3g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g3v0Filler.json",
+            "sourceHash" : "ec0492a0f0b9c5f9122942b627b7e8aafc67236e920adde62341b8fd34e24867"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xbb1a",
+                    "hash" : "0x56affe711e26e042cb63c146783e7a12ca42dd9c91768e7d6604a644c59b8011",
+                    "mixHash" : "0x96fa6ba77372005c27c98b267c952bf581cc25c09f59ded7c01cc7dc8cbd105e",
+                    "nonce" : "0xa0c6fd4e87e24454",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xb9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294",
+                    "stateRoot" : "0xc840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1897eabb3785d6863150cebed1488159d248db87d79b5664195fc580cf75c270",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa01897eabb3785d6863150cebed1488159d248db87d79b5664195fc580cf75c270a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a096fa6ba77372005c27c98b267c952bf581cc25c09f59ded7c01cc7dc8cbd105e88a0c6fd4e87e24454f8e7f8e5800183030d4094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0b1a892bf456c1ff1f73369584b0eef4209f080302911d37b6d424f0e3b2a6e88a04150d03d667884ae7106a8a3e2b3d1d6684bce3c23486f6455a88ea683148401c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1a892bf456c1ff1f73369584b0eef4209f080302911d37b6d424f0e3b2a6e88",
+                        "s" : "0x4150d03d667884ae7106a8a3e2b3d1d6684bce3c23486f6455a88ea683148401",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x56affe711e26e042cb63c146783e7a12ca42dd9c91768e7d6604a644c59b8011",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4bb1a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f44e6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g0v0.json
index b0a4fbfa2..a1d253874 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d4g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g0v0Filler.json",
             "sourceHash" : "8deb25ef5794177ccdb60c3cd10d07a2fcdf07c1d1f55d5eb15ab42cb4d16345"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf7ef",
-                    "hash" : "0x8905c48a8d3cb6e31ec5cd780369fa937c19a1e6ab4fc84e2b40d810911c0660",
-                    "mixHash" : "0x897fbad199b7b1214fe2d4472894ee28552b0e93825db6b6da1e84098ea0ee9b",
-                    "nonce" : "0x87338d1ac2a84f12",
+                    "hash" : "0xdfad7894db23983c26e7b7f96e1460b0a248bf8bd13f966d414ec40018cc3ea3",
+                    "mixHash" : "0xd99b985eebaf377cabb0a21b42c7de46ad6507e5c749e1ace1cd6880443c9695",
+                    "nonce" : "0x37c4b8b377c1e3dc",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x0353aa7ebffc144fb783e921bf6fc0767ea6726a2a0210e78b465c37af01cbb3",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x5b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfff94524e7a7239e2957337edcb5a5b48365f7c8de7f081f5fdb0dfa02b0f94a05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a00353aa7ebffc144fb783e921bf6fc0767ea6726a2a0210e78b465c37af01cbb3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f7ef8203e880a0897fbad199b7b1214fe2d4472894ee28552b0e93825db6b6da1e84098ea0ee9b8887338d1ac2a84f12f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfff94524e7a7239e2957337edcb5a5b48365f7c8de7f081f5fdb0dfa02b0f94a05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a00353aa7ebffc144fb783e921bf6fc0767ea6726a2a0210e78b465c37af01cbb3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f7ef8203e880a0d99b985eebaf377cabb0a21b42c7de46ad6507e5c749e1ace1cd6880443c96958837c4b8b377c1e3dcf8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8905c48a8d3cb6e31ec5cd780369fa937c19a1e6ab4fc84e2b40d810911c0660",
+        "lastblockhash" : "0xdfad7894db23983c26e7b7f96e1460b0a248bf8bd13f966d414ec40018cc3ea3",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d4g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g0v0Filler.json",
             "sourceHash" : "8deb25ef5794177ccdb60c3cd10d07a2fcdf07c1d1f55d5eb15ab42cb4d16345"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba57",
-                    "hash" : "0x9738d109f20513c6596e34b2b7a0e4d1bc7978aa3693532718ed42d94c53e88e",
-                    "mixHash" : "0x2e0923a68e12e9014a9c0f75ad212a96ff429bc0dd19c3c2d7a967ad5086024d",
-                    "nonce" : "0x8899463a3f9d78ec",
+                    "hash" : "0x50cc45a35c21deab364c93d7d4a9fabf7d0f8a8c8279258b06a038d36fcb0ba8",
+                    "mixHash" : "0x83375d7366f63f0a67c329669a43428a88b8b053919fedc686869ed12aebf12d",
+                    "nonce" : "0x10608e9b4518a302",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x4f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0x5b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a02e0923a68e12e9014a9c0f75ad212a96ff429bc0dd19c3c2d7a967ad5086024d888899463a3f9d78ecf8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a083375d7366f63f0a67c329669a43428a88b8b053919fedc686869ed12aebf12d8810608e9b4518a302f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9738d109f20513c6596e34b2b7a0e4d1bc7978aa3693532718ed42d94c53e88e",
+        "lastblockhash" : "0x50cc45a35c21deab364c93d7d4a9fabf7d0f8a8c8279258b06a038d36fcb0ba8",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d4g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g0v0Filler.json",
             "sourceHash" : "8deb25ef5794177ccdb60c3cd10d07a2fcdf07c1d1f55d5eb15ab42cb4d16345"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba57",
-                    "hash" : "0x82687db90911da2c8137ababc6b32a36197ddd8e6fe393cab095474fc7390c2b",
-                    "mixHash" : "0x290d6d80bf498977e67765606c763af6efc5f74170a97adef4f738389949e19b",
-                    "nonce" : "0xb53a579373dc1c65",
+                    "hash" : "0x2650f67e32921283b5abc8bb3015337f729526f03fdf81989a215563b21c90d7",
+                    "mixHash" : "0x8c50d09a09bf7b5e4c44238495721ee2513428f81222af15d734bfdb7d028bf7",
+                    "nonce" : "0x1706ec9933c8e313",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x4f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0x5b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a0290d6d80bf498977e67765606c763af6efc5f74170a97adef4f738389949e19b88b53a579373dc1c65f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a08c50d09a09bf7b5e4c44238495721ee2513428f81222af15d734bfdb7d028bf7881706ec9933c8e313f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82687db90911da2c8137ababc6b32a36197ddd8e6fe393cab095474fc7390c2b",
+        "lastblockhash" : "0x2650f67e32921283b5abc8bb3015337f729526f03fdf81989a215563b21c90d7",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g1v0.json
index 7a73a41bf..53cf0ba67 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g1v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d4g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g1v0Filler.json",
+            "sourceHash" : "67459be4c8bc11a6fb5d1354125d24b91395ee4c51006c67bc8110cd1645780d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf7ef",
+                    "hash" : "0x73715e19349dff1534342d14c080deeb598441de49931186b13cb6b9d7367804",
+                    "mixHash" : "0xf72d36abdfb61e9c39fb79693dba28f111e5fc0bda86ce9e37b762de463969b6",
+                    "nonce" : "0x6da4918de302a836",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x0353aa7ebffc144fb783e921bf6fc0767ea6726a2a0210e78b465c37af01cbb3",
+                    "stateRoot" : "0xbfff94524e7a7239e2957337edcb5a5b48365f7c8de7f081f5fdb0dfa02b0f94",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0cf585d9def98dc72c5362a3e1433684987ab87bb334b976de6370ed3c362b16",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfff94524e7a7239e2957337edcb5a5b48365f7c8de7f081f5fdb0dfa02b0f94a00cf585d9def98dc72c5362a3e1433684987ab87bb334b976de6370ed3c362b16a00353aa7ebffc144fb783e921bf6fc0767ea6726a2a0210e78b465c37af01cbb3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f7ef8203e880a0f72d36abdfb61e9c39fb79693dba28f111e5fc0bda86ce9e37b762de463969b6886da4918de302a836f8c7f8c5800183015f9094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ca02a85ccbb7dd6f559b9c0f5bb48b9ce6520493158d963ea0fcd21970821726ea0a02ad01f218facdff2039a18d174b4bbb96f3f10975ed9b1bff9e4583f547711d5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2a85ccbb7dd6f559b9c0f5bb48b9ce6520493158d963ea0fcd21970821726ea0",
+                        "s" : "0x2ad01f218facdff2039a18d174b4bbb96f3f10975ed9b1bff9e4583f547711d5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x73715e19349dff1534342d14c080deeb598441de49931186b13cb6b9d7367804",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf7ef",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0811",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d4g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g1v0Filler.json",
+            "sourceHash" : "67459be4c8bc11a6fb5d1354125d24b91395ee4c51006c67bc8110cd1645780d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba57",
+                    "hash" : "0x0e833c126b1c3c8a1e256b4fcf957841587170231eaeac4c1dcb404393271acf",
+                    "mixHash" : "0x9c3ba2a6b00f0650405a3af4893cc5d92dcdc980a606accab272119003fc4c32",
+                    "nonce" : "0xe72e4561f0756a46",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0",
+                    "stateRoot" : "0xe73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0cf585d9def98dc72c5362a3e1433684987ab87bb334b976de6370ed3c362b16",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a00cf585d9def98dc72c5362a3e1433684987ab87bb334b976de6370ed3c362b16a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a09c3ba2a6b00f0650405a3af4893cc5d92dcdc980a606accab272119003fc4c3288e72e4561f0756a46f8c7f8c5800183015f9094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ca02a85ccbb7dd6f559b9c0f5bb48b9ce6520493158d963ea0fcd21970821726ea0a02ad01f218facdff2039a18d174b4bbb96f3f10975ed9b1bff9e4583f547711d5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2a85ccbb7dd6f559b9c0f5bb48b9ce6520493158d963ea0fcd21970821726ea0",
+                        "s" : "0x2ad01f218facdff2039a18d174b4bbb96f3f10975ed9b1bff9e4583f547711d5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0e833c126b1c3c8a1e256b4fcf957841587170231eaeac4c1dcb404393271acf",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba57",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45a9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d4g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g1v0Filler.json",
+            "sourceHash" : "67459be4c8bc11a6fb5d1354125d24b91395ee4c51006c67bc8110cd1645780d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba57",
+                    "hash" : "0x8fb91396bd766ff8f2161cd2c5ac9c698baf611cda1a042e7468491f81c85c1d",
+                    "mixHash" : "0x3245426ed16ca25958a3aa2e1e8a8bbc9a5357417eef98bfa82b9af0b3610c10",
+                    "nonce" : "0x2da64bc1cb30d284",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0",
+                    "stateRoot" : "0xe73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0cf585d9def98dc72c5362a3e1433684987ab87bb334b976de6370ed3c362b16",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a00cf585d9def98dc72c5362a3e1433684987ab87bb334b976de6370ed3c362b16a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a03245426ed16ca25958a3aa2e1e8a8bbc9a5357417eef98bfa82b9af0b3610c10882da64bc1cb30d284f8c7f8c5800183015f9094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ca02a85ccbb7dd6f559b9c0f5bb48b9ce6520493158d963ea0fcd21970821726ea0a02ad01f218facdff2039a18d174b4bbb96f3f10975ed9b1bff9e4583f547711d5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2a85ccbb7dd6f559b9c0f5bb48b9ce6520493158d963ea0fcd21970821726ea0",
+                        "s" : "0x2ad01f218facdff2039a18d174b4bbb96f3f10975ed9b1bff9e4583f547711d5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8fb91396bd766ff8f2161cd2c5ac9c698baf611cda1a042e7468491f81c85c1d",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba57",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45a9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g2v0.json
index 7a73a41bf..c218b6b2d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g2v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d4g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g2v0Filler.json",
+            "sourceHash" : "3c0c608c0185c6f66dcee6e052a0332dd5297672d44b7938ac493255d7585feb"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf7ef",
+                    "hash" : "0xc29979498d890bb506f7d3687c260e386ff7d97879845c11c29758882506cd2e",
+                    "mixHash" : "0xc2faae91d5380e26c0dcebb44c2cb6d1db95e26ec32b1cec8526302e8a0d886f",
+                    "nonce" : "0x62c977bcab2c432f",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x0353aa7ebffc144fb783e921bf6fc0767ea6726a2a0210e78b465c37af01cbb3",
+                    "stateRoot" : "0xbfff94524e7a7239e2957337edcb5a5b48365f7c8de7f081f5fdb0dfa02b0f94",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xacd469f1c609a26abfd63771554da0e15aa881404f639f388f150cdda67359c9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfff94524e7a7239e2957337edcb5a5b48365f7c8de7f081f5fdb0dfa02b0f94a0acd469f1c609a26abfd63771554da0e15aa881404f639f388f150cdda67359c9a00353aa7ebffc144fb783e921bf6fc0767ea6726a2a0210e78b465c37af01cbb3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f7ef8203e880a0c2faae91d5380e26c0dcebb44c2cb6d1db95e26ec32b1cec8526302e8a0d886f8862c977bcab2c432ff8c7f8c580018301adb094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba078ec729913b398a5a2b220bc1dbfa10231d6bdc4625e407b3ec8c5a8d9f53a04a06fd8378eab26c32d1a5690c433ee92d9ce3eb7a0b08180603ff3e4aae29b8fafc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78ec729913b398a5a2b220bc1dbfa10231d6bdc4625e407b3ec8c5a8d9f53a04",
+                        "s" : "0x6fd8378eab26c32d1a5690c433ee92d9ce3eb7a0b08180603ff3e4aae29b8faf",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc29979498d890bb506f7d3687c260e386ff7d97879845c11c29758882506cd2e",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf7ef",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0811",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d4g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g2v0Filler.json",
+            "sourceHash" : "3c0c608c0185c6f66dcee6e052a0332dd5297672d44b7938ac493255d7585feb"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba57",
+                    "hash" : "0xfd60508a32b3db0f8119e21ff9535e4830e7dc07198cf84ce684f64f291a3020",
+                    "mixHash" : "0x47e266cf60d046a69bb98a32f77efa8786be4adac28a1425702388fe304e0ee5",
+                    "nonce" : "0x8bd1438ab2aae79d",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0",
+                    "stateRoot" : "0xe73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xacd469f1c609a26abfd63771554da0e15aa881404f639f388f150cdda67359c9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a0acd469f1c609a26abfd63771554da0e15aa881404f639f388f150cdda67359c9a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a047e266cf60d046a69bb98a32f77efa8786be4adac28a1425702388fe304e0ee5888bd1438ab2aae79df8c7f8c580018301adb094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba078ec729913b398a5a2b220bc1dbfa10231d6bdc4625e407b3ec8c5a8d9f53a04a06fd8378eab26c32d1a5690c433ee92d9ce3eb7a0b08180603ff3e4aae29b8fafc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78ec729913b398a5a2b220bc1dbfa10231d6bdc4625e407b3ec8c5a8d9f53a04",
+                        "s" : "0x6fd8378eab26c32d1a5690c433ee92d9ce3eb7a0b08180603ff3e4aae29b8faf",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfd60508a32b3db0f8119e21ff9535e4830e7dc07198cf84ce684f64f291a3020",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba57",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45a9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d4g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g2v0Filler.json",
+            "sourceHash" : "3c0c608c0185c6f66dcee6e052a0332dd5297672d44b7938ac493255d7585feb"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba57",
+                    "hash" : "0xd0d93008d517e60d3892e089117fde62b75935a909bc5ae1252e008d228e816e",
+                    "mixHash" : "0x4b75acf3ff1d3fb2637a94d82d769e7c13187694f1818cf681873c51e0138f2a",
+                    "nonce" : "0xe3928752122092df",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0",
+                    "stateRoot" : "0xe73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xacd469f1c609a26abfd63771554da0e15aa881404f639f388f150cdda67359c9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a0acd469f1c609a26abfd63771554da0e15aa881404f639f388f150cdda67359c9a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a04b75acf3ff1d3fb2637a94d82d769e7c13187694f1818cf681873c51e0138f2a88e3928752122092dff8c7f8c580018301adb094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba078ec729913b398a5a2b220bc1dbfa10231d6bdc4625e407b3ec8c5a8d9f53a04a06fd8378eab26c32d1a5690c433ee92d9ce3eb7a0b08180603ff3e4aae29b8fafc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78ec729913b398a5a2b220bc1dbfa10231d6bdc4625e407b3ec8c5a8d9f53a04",
+                        "s" : "0x6fd8378eab26c32d1a5690c433ee92d9ce3eb7a0b08180603ff3e4aae29b8faf",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd0d93008d517e60d3892e089117fde62b75935a909bc5ae1252e008d228e816e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba57",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45a9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g3v0.json
index 7a73a41bf..1fa3ae3e3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g3v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d4g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g3v0Filler.json",
+            "sourceHash" : "c4815e1a329fa0a81a47b23a3b23d05b8daa9515b120d54565fff763a69cc7f9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf7ef",
+                    "hash" : "0x556c308264f53c22b2aaa1cb652d8ce7b35d46dcd29c79971b8439981b9a12c3",
+                    "mixHash" : "0xf2ded664dd9251151a8496b3ed59bf3a9c3bf4a3d33c6a8614f4066f6bfdf9de",
+                    "nonce" : "0xc7b3a1f220784618",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x0353aa7ebffc144fb783e921bf6fc0767ea6726a2a0210e78b465c37af01cbb3",
+                    "stateRoot" : "0xbfff94524e7a7239e2957337edcb5a5b48365f7c8de7f081f5fdb0dfa02b0f94",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf1bbc80fef339356264cae2c442aeea9c0f93db20cee444c7be9d85eaafb0ce5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfff94524e7a7239e2957337edcb5a5b48365f7c8de7f081f5fdb0dfa02b0f94a0f1bbc80fef339356264cae2c442aeea9c0f93db20cee444c7be9d85eaafb0ce5a00353aa7ebffc144fb783e921bf6fc0767ea6726a2a0210e78b465c37af01cbb3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f7ef8203e880a0f2ded664dd9251151a8496b3ed59bf3a9c3bf4a3d33c6a8614f4066f6bfdf9de88c7b3a1f220784618f8c7f8c5800183030d4094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ca0896841c7553e8b516374fe73f1b1fc12ac7f066a58c88c57d6286b5a76ef50f5a06361fbd3dee136dfb20a6abb85b12656e50126cca041b43b391dca122f8659d4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x896841c7553e8b516374fe73f1b1fc12ac7f066a58c88c57d6286b5a76ef50f5",
+                        "s" : "0x6361fbd3dee136dfb20a6abb85b12656e50126cca041b43b391dca122f8659d4",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x556c308264f53c22b2aaa1cb652d8ce7b35d46dcd29c79971b8439981b9a12c3",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf7ef",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0811",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d4g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g3v0Filler.json",
+            "sourceHash" : "c4815e1a329fa0a81a47b23a3b23d05b8daa9515b120d54565fff763a69cc7f9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba57",
+                    "hash" : "0xe9bc6ddb61f213cc9465b65df73786c931a870dd12f0003414a2673930136e93",
+                    "mixHash" : "0xf41dd5e90832004a269fa06823dfd0d97fc74191768fe984b21a3dc31f7d2c5c",
+                    "nonce" : "0x46ef81a60d0960ae",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0",
+                    "stateRoot" : "0xe73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf1bbc80fef339356264cae2c442aeea9c0f93db20cee444c7be9d85eaafb0ce5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a0f1bbc80fef339356264cae2c442aeea9c0f93db20cee444c7be9d85eaafb0ce5a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a0f41dd5e90832004a269fa06823dfd0d97fc74191768fe984b21a3dc31f7d2c5c8846ef81a60d0960aef8c7f8c5800183030d4094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ca0896841c7553e8b516374fe73f1b1fc12ac7f066a58c88c57d6286b5a76ef50f5a06361fbd3dee136dfb20a6abb85b12656e50126cca041b43b391dca122f8659d4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x896841c7553e8b516374fe73f1b1fc12ac7f066a58c88c57d6286b5a76ef50f5",
+                        "s" : "0x6361fbd3dee136dfb20a6abb85b12656e50126cca041b43b391dca122f8659d4",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe9bc6ddb61f213cc9465b65df73786c931a870dd12f0003414a2673930136e93",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba57",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45a9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d4g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g3v0Filler.json",
+            "sourceHash" : "c4815e1a329fa0a81a47b23a3b23d05b8daa9515b120d54565fff763a69cc7f9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba57",
+                    "hash" : "0x2b19d45b205283531cc6997f4ce6eb7618260572200837876acca8cd01ed8ea8",
+                    "mixHash" : "0xf5831a3aa3fbebe933b0e43dfd27bc2a72a249c0084ce6ec82bbe8d3d51add5d",
+                    "nonce" : "0x6fb837a19a3a01c9",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0",
+                    "stateRoot" : "0xe73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf1bbc80fef339356264cae2c442aeea9c0f93db20cee444c7be9d85eaafb0ce5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a0f1bbc80fef339356264cae2c442aeea9c0f93db20cee444c7be9d85eaafb0ce5a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a0f5831a3aa3fbebe933b0e43dfd27bc2a72a249c0084ce6ec82bbe8d3d51add5d886fb837a19a3a01c9f8c7f8c5800183030d4094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ca0896841c7553e8b516374fe73f1b1fc12ac7f066a58c88c57d6286b5a76ef50f5a06361fbd3dee136dfb20a6abb85b12656e50126cca041b43b391dca122f8659d4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x896841c7553e8b516374fe73f1b1fc12ac7f066a58c88c57d6286b5a76ef50f5",
+                        "s" : "0x6361fbd3dee136dfb20a6abb85b12656e50126cca041b43b391dca122f8659d4",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2b19d45b205283531cc6997f4ce6eb7618260572200837876acca8cd01ed8ea8",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba57",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45a9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g0v0.json
index 18179ad8f..b218be209 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d5g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g0v0Filler.json",
             "sourceHash" : "d16900ab43fa24440fbc292fff9399e053560dc3e593cabf7835d9383f4a3b75"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9be",
-                    "hash" : "0xaa73599edc544ae59b4757a9d1f45323f33cf51634c910c657717b7c5d777d43",
-                    "mixHash" : "0xb70d3ffbd9f9c0fd85e838877a5af396099be845de0d1161c328c9b0b149dc12",
-                    "nonce" : "0xf61f2a0b16d23e17",
+                    "hash" : "0x0af56e51cb550b29ed0d01f7411b8ad635276758a88134e8b07159382e5365e4",
+                    "mixHash" : "0x9727dd71a22e42f22f3650b8005e31826279ddaf70f43c16c52a9b42ab21edec",
+                    "nonce" : "0x44e45b969ad770f0",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xec10be0e02571c26afa0773680c5f437377c410a8408f8712dd9e6792ae645f0",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xe5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70af",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0790d4175066e4d61003e497874be7f83ab3fa7fa856d765d9f9816413ad1410ea0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa0ec10be0e02571c26afa0773680c5f437377c410a8408f8712dd9e6792ae645f0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9be8203e880a0b70d3ffbd9f9c0fd85e838877a5af396099be845de0d1161c328c9b0b149dc1288f61f2a0b16d23e17f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0790d4175066e4d61003e497874be7f83ab3fa7fa856d765d9f9816413ad1410ea0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa0ec10be0e02571c26afa0773680c5f437377c410a8408f8712dd9e6792ae645f0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9be8203e880a09727dd71a22e42f22f3650b8005e31826279ddaf70f43c16c52a9b42ab21edec8844e45b969ad770f0f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa73599edc544ae59b4757a9d1f45323f33cf51634c910c657717b7c5d777d43",
+        "lastblockhash" : "0x0af56e51cb550b29ed0d01f7411b8ad635276758a88134e8b07159382e5365e4",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d5g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g0v0Filler.json",
             "sourceHash" : "d16900ab43fa24440fbc292fff9399e053560dc3e593cabf7835d9383f4a3b75"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98b",
-                    "hash" : "0xa62030eddb14d66772fb795b852f9ef6d3d4d88f0d77b49a46116ebbb7d9d8ff",
-                    "mixHash" : "0xdd3c2e4399e49b53a0d796c564cdd247c4988bbc93621bd3bc5c8074da404928",
-                    "nonce" : "0x6e02c64a4a6aefa7",
+                    "hash" : "0x437f436454bce011bb3d14a73ae8f13be91c192bb33766957f7b45e9c47e228f",
+                    "mixHash" : "0xcb2c42b91168c8e4baf15103a0231fedc4ddbafb078cab34df1b976d0015defd",
+                    "nonce" : "0x455717c53138ec18",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0xe5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70af",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a0dd3c2e4399e49b53a0d796c564cdd247c4988bbc93621bd3bc5c8074da404928886e02c64a4a6aefa7f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a0cb2c42b91168c8e4baf15103a0231fedc4ddbafb078cab34df1b976d0015defd88455717c53138ec18f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa62030eddb14d66772fb795b852f9ef6d3d4d88f0d77b49a46116ebbb7d9d8ff",
+        "lastblockhash" : "0x437f436454bce011bb3d14a73ae8f13be91c192bb33766957f7b45e9c47e228f",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d5g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g0v0Filler.json",
             "sourceHash" : "d16900ab43fa24440fbc292fff9399e053560dc3e593cabf7835d9383f4a3b75"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98b",
-                    "hash" : "0xfad5012de2c699101cd56ab94a8368c67ff8fa04f918b7469bada323e95c232c",
-                    "mixHash" : "0x28da4610df1c3de8e16fe374bd69bee16dc125c34ed8c816cb2a20c65723f857",
-                    "nonce" : "0x63065f035f9ee73b",
+                    "hash" : "0x8c136555f0a9fb6b4620e32d0b4cfe03a7bce5f663d584ce930766605ce3351d",
+                    "mixHash" : "0x95d0781ea842c5949ff38f356f3906e3663b1abcc6b4d18d313e1ff350181b44",
+                    "nonce" : "0x749c1405060ec375",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0xe5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70af",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a028da4610df1c3de8e16fe374bd69bee16dc125c34ed8c816cb2a20c65723f8578863065f035f9ee73bf8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a095d0781ea842c5949ff38f356f3906e3663b1abcc6b4d18d313e1ff350181b4488749c1405060ec375f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfad5012de2c699101cd56ab94a8368c67ff8fa04f918b7469bada323e95c232c",
+        "lastblockhash" : "0x8c136555f0a9fb6b4620e32d0b4cfe03a7bce5f663d584ce930766605ce3351d",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g1v0.json
index 7a73a41bf..ea50a0332 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d5g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g1v0Filler.json",
+            "sourceHash" : "b15a2193add508a4e7168145ee587299003d63c3a44904586c85bbef561f3c35"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9be",
+                    "hash" : "0x178be2666bd986e885db02ea400c2c696cc74679e84192175de09ff344fa5d02",
+                    "mixHash" : "0xcee3daa63751a0bb31b5894b7ac7d075501654200fcb49c4900df2b0f78d2663",
+                    "nonce" : "0x1fa140d89d9471be",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xec10be0e02571c26afa0773680c5f437377c410a8408f8712dd9e6792ae645f0",
+                    "stateRoot" : "0x790d4175066e4d61003e497874be7f83ab3fa7fa856d765d9f9816413ad1410e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56212dfa26ee0bcb5ac2b1d6d87812d0dd53ea77d06314f87669a82a31c1cdee",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0790d4175066e4d61003e497874be7f83ab3fa7fa856d765d9f9816413ad1410ea056212dfa26ee0bcb5ac2b1d6d87812d0dd53ea77d06314f87669a82a31c1cdeea0ec10be0e02571c26afa0773680c5f437377c410a8408f8712dd9e6792ae645f0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9be8203e880a0cee3daa63751a0bb31b5894b7ac7d075501654200fcb49c4900df2b0f78d2663881fa140d89d9471bef8c4f8c2800183015f9094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba0590784d5de17000579f36b7ca9e696f8698d276903c556913eaa49ee102a0529a03193649698710ee3148f6178af992a52fa67a282fec60aaa6a3c4677fa0dc6ebc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x590784d5de17000579f36b7ca9e696f8698d276903c556913eaa49ee102a0529",
+                        "s" : "0x3193649698710ee3148f6178af992a52fa67a282fec60aaa6a3c4677fa0dc6eb",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x178be2666bd986e885db02ea400c2c696cc74679e84192175de09ff344fa5d02",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9be",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4642",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d5g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g1v0Filler.json",
+            "sourceHash" : "b15a2193add508a4e7168145ee587299003d63c3a44904586c85bbef561f3c35"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0xdcbd74403b39c6e427720647ad957337f059904cf217e1f96803c34e59816e8a",
+                    "mixHash" : "0x8e8fcea0116384f83cd983b591d9cda04666f19ea5f90cc987dfd8d280463a40",
+                    "nonce" : "0x672ae51953748710",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56212dfa26ee0bcb5ac2b1d6d87812d0dd53ea77d06314f87669a82a31c1cdee",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a056212dfa26ee0bcb5ac2b1d6d87812d0dd53ea77d06314f87669a82a31c1cdeea0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a08e8fcea0116384f83cd983b591d9cda04666f19ea5f90cc987dfd8d280463a4088672ae51953748710f8c4f8c2800183015f9094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba0590784d5de17000579f36b7ca9e696f8698d276903c556913eaa49ee102a0529a03193649698710ee3148f6178af992a52fa67a282fec60aaa6a3c4677fa0dc6ebc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x590784d5de17000579f36b7ca9e696f8698d276903c556913eaa49ee102a0529",
+                        "s" : "0x3193649698710ee3148f6178af992a52fa67a282fec60aaa6a3c4677fa0dc6eb",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdcbd74403b39c6e427720647ad957337f059904cf217e1f96803c34e59816e8a",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d5g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g1v0Filler.json",
+            "sourceHash" : "b15a2193add508a4e7168145ee587299003d63c3a44904586c85bbef561f3c35"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0xb8849e2bd52fa03e4e88b3e6ddf7f40361cbf91ebe1a6ac5f16432b69c228b5f",
+                    "mixHash" : "0x600fd7c6872c0b25c4e8dd2224fd46e704ee54c47818b266952c1b7255912c20",
+                    "nonce" : "0x57295701e8913352",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56212dfa26ee0bcb5ac2b1d6d87812d0dd53ea77d06314f87669a82a31c1cdee",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a056212dfa26ee0bcb5ac2b1d6d87812d0dd53ea77d06314f87669a82a31c1cdeea0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a0600fd7c6872c0b25c4e8dd2224fd46e704ee54c47818b266952c1b7255912c208857295701e8913352f8c4f8c2800183015f9094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba0590784d5de17000579f36b7ca9e696f8698d276903c556913eaa49ee102a0529a03193649698710ee3148f6178af992a52fa67a282fec60aaa6a3c4677fa0dc6ebc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x590784d5de17000579f36b7ca9e696f8698d276903c556913eaa49ee102a0529",
+                        "s" : "0x3193649698710ee3148f6178af992a52fa67a282fec60aaa6a3c4677fa0dc6eb",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb8849e2bd52fa03e4e88b3e6ddf7f40361cbf91ebe1a6ac5f16432b69c228b5f",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g2v0.json
index 7a73a41bf..f4c8463c8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d5g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g2v0Filler.json",
+            "sourceHash" : "c6419fa74c84514b1a7fc5e17674ec3256d9edce0cf12a8045da67e1853e4ff9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9be",
+                    "hash" : "0x12df22f248ac02ab9a6442b6ab598079f8702ab0140fd5b88525b84ec268091b",
+                    "mixHash" : "0xf2bfaedd674b55a651e2992401d33853b8c67122db21b33859aa03462ffe0d82",
+                    "nonce" : "0xcb07ca580f63c1b1",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xec10be0e02571c26afa0773680c5f437377c410a8408f8712dd9e6792ae645f0",
+                    "stateRoot" : "0x790d4175066e4d61003e497874be7f83ab3fa7fa856d765d9f9816413ad1410e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6acbde50dfecfbc6eef4595ceb18d7943371b11fea21c85a357a4038cdc6d14f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0790d4175066e4d61003e497874be7f83ab3fa7fa856d765d9f9816413ad1410ea06acbde50dfecfbc6eef4595ceb18d7943371b11fea21c85a357a4038cdc6d14fa0ec10be0e02571c26afa0773680c5f437377c410a8408f8712dd9e6792ae645f0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9be8203e880a0f2bfaedd674b55a651e2992401d33853b8c67122db21b33859aa03462ffe0d8288cb07ca580f63c1b1f8c4f8c280018301adb094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ca0d618a7a4e4a14d4737781725eadeff1f6e0ebca8974db79433a3fe939a5834f5a055e398dd6d47270957780f8fac55c6baffb23573e18e2804b72f2dd1fa594995c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd618a7a4e4a14d4737781725eadeff1f6e0ebca8974db79433a3fe939a5834f5",
+                        "s" : "0x55e398dd6d47270957780f8fac55c6baffb23573e18e2804b72f2dd1fa594995",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x12df22f248ac02ab9a6442b6ab598079f8702ab0140fd5b88525b84ec268091b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9be",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4642",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d5g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g2v0Filler.json",
+            "sourceHash" : "c6419fa74c84514b1a7fc5e17674ec3256d9edce0cf12a8045da67e1853e4ff9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0xb5b89820d8422cf13c905d7e40fddf27d835947ba4e888a7530fbdd7e743c520",
+                    "mixHash" : "0xa2c4c6bdc824eeafd338f52b54f0fe70dd4f9ce29bdac8338b3d4856850a1d96",
+                    "nonce" : "0xb222f1ae4ea3ade9",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6acbde50dfecfbc6eef4595ceb18d7943371b11fea21c85a357a4038cdc6d14f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a06acbde50dfecfbc6eef4595ceb18d7943371b11fea21c85a357a4038cdc6d14fa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a0a2c4c6bdc824eeafd338f52b54f0fe70dd4f9ce29bdac8338b3d4856850a1d9688b222f1ae4ea3ade9f8c4f8c280018301adb094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ca0d618a7a4e4a14d4737781725eadeff1f6e0ebca8974db79433a3fe939a5834f5a055e398dd6d47270957780f8fac55c6baffb23573e18e2804b72f2dd1fa594995c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd618a7a4e4a14d4737781725eadeff1f6e0ebca8974db79433a3fe939a5834f5",
+                        "s" : "0x55e398dd6d47270957780f8fac55c6baffb23573e18e2804b72f2dd1fa594995",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb5b89820d8422cf13c905d7e40fddf27d835947ba4e888a7530fbdd7e743c520",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d5g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g2v0Filler.json",
+            "sourceHash" : "c6419fa74c84514b1a7fc5e17674ec3256d9edce0cf12a8045da67e1853e4ff9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0xddb1d479b9991fd0e0fae33048880116af315730d04bad6027880c55a5cd5bb5",
+                    "mixHash" : "0x3e67c7800ce01b9ce40122a36a5d60d3ef0835341586c5a8ab42eae3fa4022d9",
+                    "nonce" : "0x62d5a1d5e1d1153b",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6acbde50dfecfbc6eef4595ceb18d7943371b11fea21c85a357a4038cdc6d14f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a06acbde50dfecfbc6eef4595ceb18d7943371b11fea21c85a357a4038cdc6d14fa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a03e67c7800ce01b9ce40122a36a5d60d3ef0835341586c5a8ab42eae3fa4022d98862d5a1d5e1d1153bf8c4f8c280018301adb094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ca0d618a7a4e4a14d4737781725eadeff1f6e0ebca8974db79433a3fe939a5834f5a055e398dd6d47270957780f8fac55c6baffb23573e18e2804b72f2dd1fa594995c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd618a7a4e4a14d4737781725eadeff1f6e0ebca8974db79433a3fe939a5834f5",
+                        "s" : "0x55e398dd6d47270957780f8fac55c6baffb23573e18e2804b72f2dd1fa594995",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xddb1d479b9991fd0e0fae33048880116af315730d04bad6027880c55a5cd5bb5",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g3v0.json
index 7a73a41bf..e17d55d21 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d5g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g3v0Filler.json",
+            "sourceHash" : "d3f6b5d76f4ec1dff5f231f9dc8b5313293a2ec0af09b16e3823a5b7c8469b30"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9be",
+                    "hash" : "0xd8326991f348d34f3aedc85509f381c526ae3a246615c7fef66c38b2412164a8",
+                    "mixHash" : "0x05e2075019df16c4f706495b41fbf165f535be9c668f6e3c186a9e7a161ec265",
+                    "nonce" : "0xda9470a0449f35e2",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xec10be0e02571c26afa0773680c5f437377c410a8408f8712dd9e6792ae645f0",
+                    "stateRoot" : "0x790d4175066e4d61003e497874be7f83ab3fa7fa856d765d9f9816413ad1410e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6393827ac51d811fcb6fd7fcf482c29747dc0b322a3d513d4150ae29102a1e91",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0790d4175066e4d61003e497874be7f83ab3fa7fa856d765d9f9816413ad1410ea06393827ac51d811fcb6fd7fcf482c29747dc0b322a3d513d4150ae29102a1e91a0ec10be0e02571c26afa0773680c5f437377c410a8408f8712dd9e6792ae645f0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9be8203e880a005e2075019df16c4f706495b41fbf165f535be9c668f6e3c186a9e7a161ec26588da9470a0449f35e2f8c4f8c2800183030d4094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba01cbc43f244ee46e717aa0e1460d0e8f306f5901bf89fe173dd721fd555dabe21a03cf6a80a40d0fe7495980805c8a5cd2e081db91574b1b4be57309a38915d3cc6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1cbc43f244ee46e717aa0e1460d0e8f306f5901bf89fe173dd721fd555dabe21",
+                        "s" : "0x3cf6a80a40d0fe7495980805c8a5cd2e081db91574b1b4be57309a38915d3cc6",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd8326991f348d34f3aedc85509f381c526ae3a246615c7fef66c38b2412164a8",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb9be",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4642",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d5g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g3v0Filler.json",
+            "sourceHash" : "d3f6b5d76f4ec1dff5f231f9dc8b5313293a2ec0af09b16e3823a5b7c8469b30"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0x4cbefb9c8fe0dae39b2f170e4bb72c2a5a39dc81cbae9e2b36a5f6fb11e7803b",
+                    "mixHash" : "0x5fa825df9b7ddb4715f9e9e696567e594d93086aa7f0619d79527a8310127d9a",
+                    "nonce" : "0xf85dcfae7b8f405f",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6393827ac51d811fcb6fd7fcf482c29747dc0b322a3d513d4150ae29102a1e91",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a06393827ac51d811fcb6fd7fcf482c29747dc0b322a3d513d4150ae29102a1e91a0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a05fa825df9b7ddb4715f9e9e696567e594d93086aa7f0619d79527a8310127d9a88f85dcfae7b8f405ff8c4f8c2800183030d4094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba01cbc43f244ee46e717aa0e1460d0e8f306f5901bf89fe173dd721fd555dabe21a03cf6a80a40d0fe7495980805c8a5cd2e081db91574b1b4be57309a38915d3cc6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1cbc43f244ee46e717aa0e1460d0e8f306f5901bf89fe173dd721fd555dabe21",
+                        "s" : "0x3cf6a80a40d0fe7495980805c8a5cd2e081db91574b1b4be57309a38915d3cc6",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4cbefb9c8fe0dae39b2f170e4bb72c2a5a39dc81cbae9e2b36a5f6fb11e7803b",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d5g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g3v0Filler.json",
+            "sourceHash" : "d3f6b5d76f4ec1dff5f231f9dc8b5313293a2ec0af09b16e3823a5b7c8469b30"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0x09c2a8a267f529d5a5ca4a1edfb9171101e0ebe70f73999cc2e99b7dec949538",
+                    "mixHash" : "0x6638aadb1a25721c4337dfbbe98de140f04e874b2bd88633346ff12a102e8c0d",
+                    "nonce" : "0x226d6b2dd40320cc",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6393827ac51d811fcb6fd7fcf482c29747dc0b322a3d513d4150ae29102a1e91",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a06393827ac51d811fcb6fd7fcf482c29747dc0b322a3d513d4150ae29102a1e91a0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a06638aadb1a25721c4337dfbbe98de140f04e874b2bd88633346ff12a102e8c0d88226d6b2dd40320ccf8c4f8c2800183030d4094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba01cbc43f244ee46e717aa0e1460d0e8f306f5901bf89fe173dd721fd555dabe21a03cf6a80a40d0fe7495980805c8a5cd2e081db91574b1b4be57309a38915d3cc6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1cbc43f244ee46e717aa0e1460d0e8f306f5901bf89fe173dd721fd555dabe21",
+                        "s" : "0x3cf6a80a40d0fe7495980805c8a5cd2e081db91574b1b4be57309a38915d3cc6",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x09c2a8a267f529d5a5ca4a1edfb9171101e0ebe70f73999cc2e99b7dec949538",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g0v0.json
index 32cce8da7..8d7149284 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d6g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g0v0Filler.json",
             "sourceHash" : "71c22ad50f0ae39267b662460a542f8c436bb886a45b4e624f56beeb82745254"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf4d9",
-                    "hash" : "0x68580ded332fccecf1bd7442a0ef17b59848af6e436d5315321787239bdc95f1",
-                    "mixHash" : "0xa3edd492086e351e0204fec84e4ccfa6d29866c61ce93c21c9efc7561610ca9f",
-                    "nonce" : "0xbded47cfa00eddb6",
+                    "hash" : "0xefc1ef0f37d58732f0cfcd39290ba0bd73cf3fc5064072687cba65a163821505",
+                    "mixHash" : "0xd3a086ff543d4c96c8d9f3602aa1a59dfafd076f16d67f3b43d1ee84cf577a7c",
+                    "nonce" : "0xda400a5107c72cf6",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x026cebb8d43d89b2d2e00f3dc3429d5c323e6509d4d436563cdb84b3d6ecf6e8",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x9bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c799427864af9bfef3ac7448d09b687122af0b12ea08adcd3daf1c35e766dbca09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a0026cebb8d43d89b2d2e00f3dc3429d5c323e6509d4d436563cdb84b3d6ecf6e8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4d98203e880a0a3edd492086e351e0204fec84e4ccfa6d29866c61ce93c21c9efc7561610ca9f88bded47cfa00eddb6f8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
+                "rlp" : "0xf902e4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c799427864af9bfef3ac7448d09b687122af0b12ea08adcd3daf1c35e766dbca09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a0026cebb8d43d89b2d2e00f3dc3429d5c323e6509d4d436563cdb84b3d6ecf6e8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4d98203e880a0d3a086ff543d4c96c8d9f3602aa1a59dfafd076f16d67f3b43d1ee84cf577a7c88da400a5107c72cf6f8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x68580ded332fccecf1bd7442a0ef17b59848af6e436d5315321787239bdc95f1",
+        "lastblockhash" : "0xefc1ef0f37d58732f0cfcd39290ba0bd73cf3fc5064072687cba65a163821505",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d6g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g0v0Filler.json",
             "sourceHash" : "71c22ad50f0ae39267b662460a542f8c436bb886a45b4e624f56beeb82745254"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba0e",
-                    "hash" : "0xa262c7590579fc9a766cb6f673d76a1a71e1fe778b91ed98c2a6a714f46b7476",
-                    "mixHash" : "0xed413023f0b7986a01d71fea84e6f8ca78d9d1a6b300e177f2a302c46d2cb544",
-                    "nonce" : "0x03433ca76165ee9b",
+                    "hash" : "0x3df94784c09a3f1112f8510c3016586e465743a1bd3f9b4dc22890fa0904336d",
+                    "mixHash" : "0xfab2d0ed36f14c385e1fd2d53907ea28211ebea0c913d37ce8edf2a9b099c00e",
+                    "nonce" : "0x41e53cbaf4de0ec2",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xe75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0x9bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a0ed413023f0b7986a01d71fea84e6f8ca78d9d1a6b300e177f2a302c46d2cb5448803433ca76165ee9bf8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
+                "rlp" : "0xf902e4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a0fab2d0ed36f14c385e1fd2d53907ea28211ebea0c913d37ce8edf2a9b099c00e8841e53cbaf4de0ec2f8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa262c7590579fc9a766cb6f673d76a1a71e1fe778b91ed98c2a6a714f46b7476",
+        "lastblockhash" : "0x3df94784c09a3f1112f8510c3016586e465743a1bd3f9b4dc22890fa0904336d",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d6g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g0v0Filler.json",
             "sourceHash" : "71c22ad50f0ae39267b662460a542f8c436bb886a45b4e624f56beeb82745254"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba0e",
-                    "hash" : "0xce0a5d683301869ce05ed08e3e11d7eb71a7d4a8cbfa1a8d8fa406402284b283",
-                    "mixHash" : "0xa3d274ed254ad77b5d54b1ae2d3f5c3309839adae4bf89cc232383707ba5cdaa",
-                    "nonce" : "0x5ae2bd043e2769ef",
+                    "hash" : "0xb364b5199d37e7d485bc5a9cb0c5bce83de4e5ae70c3f9eb991a84023f87d72f",
+                    "mixHash" : "0x267daa13341d8a9f09cd0e2316abbca8b962f728b5a1f5ee4f0032a30901247f",
+                    "nonce" : "0x0bc7df26ca9fd76c",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xe75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0x9bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a0a3d274ed254ad77b5d54b1ae2d3f5c3309839adae4bf89cc232383707ba5cdaa885ae2bd043e2769eff8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
+                "rlp" : "0xf902e4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a0267daa13341d8a9f09cd0e2316abbca8b962f728b5a1f5ee4f0032a30901247f880bc7df26ca9fd76cf8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xce0a5d683301869ce05ed08e3e11d7eb71a7d4a8cbfa1a8d8fa406402284b283",
+        "lastblockhash" : "0xb364b5199d37e7d485bc5a9cb0c5bce83de4e5ae70c3f9eb991a84023f87d72f",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g1v0.json
index 7a73a41bf..00a711bd1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g1v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d6g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g1v0Filler.json",
+            "sourceHash" : "cf907903e25fad0fc232a60fb8ea44a072a53050a8ca9d0cc6ef7e5ab9caa357"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4d9",
+                    "hash" : "0xa0fe6b633d340ca2296c1765d28627c85ec796c04b29941b3e9662b2af53806c",
+                    "mixHash" : "0xf08b6695702298a38d56fa6e0f83fa072e39385ffb6ed423777ae25561cdf1fa",
+                    "nonce" : "0x3eae0cd6316fb8f6",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x026cebb8d43d89b2d2e00f3dc3429d5c323e6509d4d436563cdb84b3d6ecf6e8",
+                    "stateRoot" : "0x4c799427864af9bfef3ac7448d09b687122af0b12ea08adcd3daf1c35e766dbc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xda1aece683b61613dcd52f66729b103d586bb912cbbae961997fffbbe8260d39",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c799427864af9bfef3ac7448d09b687122af0b12ea08adcd3daf1c35e766dbca0da1aece683b61613dcd52f66729b103d586bb912cbbae961997fffbbe8260d39a0026cebb8d43d89b2d2e00f3dc3429d5c323e6509d4d436563cdb84b3d6ecf6e8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4d98203e880a0f08b6695702298a38d56fa6e0f83fa072e39385ffb6ed423777ae25561cdf1fa883eae0cd6316fb8f6f8e4f8e2800183015f9094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ba03d5b7733ebe0042481a84678bc2ebe46453b0583ee71240f014813761258b773a011a1e38664cf1eed475630636aaba20986e248f6dd16734c0391fb6d2076d6e8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d5b7733ebe0042481a84678bc2ebe46453b0583ee71240f014813761258b773",
+                        "s" : "0x11a1e38664cf1eed475630636aaba20986e248f6dd16734c0391fb6d2076d6e8",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa0fe6b633d340ca2296c1765d28627c85ec796c04b29941b3e9662b2af53806c",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf4d9",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b27",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d6g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g1v0Filler.json",
+            "sourceHash" : "cf907903e25fad0fc232a60fb8ea44a072a53050a8ca9d0cc6ef7e5ab9caa357"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba0e",
+                    "hash" : "0x50fe70ad13fe45f94a0513f8cf0d4853363e48f941d41714b1416b11fbb3df11",
+                    "mixHash" : "0xb510fc87511b28b584f65908fdcafc81bd09692694af62fd4616427ffb703013",
+                    "nonce" : "0x98393441b519b0cd",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xe75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084",
+                    "stateRoot" : "0xad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xda1aece683b61613dcd52f66729b103d586bb912cbbae961997fffbbe8260d39",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa0da1aece683b61613dcd52f66729b103d586bb912cbbae961997fffbbe8260d39a0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a0b510fc87511b28b584f65908fdcafc81bd09692694af62fd4616427ffb7030138898393441b519b0cdf8e4f8e2800183015f9094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ba03d5b7733ebe0042481a84678bc2ebe46453b0583ee71240f014813761258b773a011a1e38664cf1eed475630636aaba20986e248f6dd16734c0391fb6d2076d6e8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d5b7733ebe0042481a84678bc2ebe46453b0583ee71240f014813761258b773",
+                        "s" : "0x11a1e38664cf1eed475630636aaba20986e248f6dd16734c0391fb6d2076d6e8",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x50fe70ad13fe45f94a0513f8cf0d4853363e48f941d41714b1416b11fbb3df11",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba0e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45f2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d6g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g1v0Filler.json",
+            "sourceHash" : "cf907903e25fad0fc232a60fb8ea44a072a53050a8ca9d0cc6ef7e5ab9caa357"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba0e",
+                    "hash" : "0x908cd71ea0ef587788b7535f8506f59f60329bc671e7322f92f781fc5a154c3a",
+                    "mixHash" : "0x11bc349866ffed341d2d0c4652c44a4639903c8a450a2f66b71f625d90ef7651",
+                    "nonce" : "0x6d21f01a283b103b",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xe75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084",
+                    "stateRoot" : "0xad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xda1aece683b61613dcd52f66729b103d586bb912cbbae961997fffbbe8260d39",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa0da1aece683b61613dcd52f66729b103d586bb912cbbae961997fffbbe8260d39a0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a011bc349866ffed341d2d0c4652c44a4639903c8a450a2f66b71f625d90ef7651886d21f01a283b103bf8e4f8e2800183015f9094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ba03d5b7733ebe0042481a84678bc2ebe46453b0583ee71240f014813761258b773a011a1e38664cf1eed475630636aaba20986e248f6dd16734c0391fb6d2076d6e8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d5b7733ebe0042481a84678bc2ebe46453b0583ee71240f014813761258b773",
+                        "s" : "0x11a1e38664cf1eed475630636aaba20986e248f6dd16734c0391fb6d2076d6e8",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x908cd71ea0ef587788b7535f8506f59f60329bc671e7322f92f781fc5a154c3a",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba0e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45f2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g2v0.json
index 7a73a41bf..63090bfa7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g2v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d6g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g2v0Filler.json",
+            "sourceHash" : "0d653e9ccc8dceef0b0a2038be24b94aa8eec0d3bff73d1bfef11f4d3471fd29"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4d9",
+                    "hash" : "0xa23e703641fcf77750156268a4e3c6fe7a73f44b42c4a87bebf7de7d8aff33ea",
+                    "mixHash" : "0xcd90a21bf95c996973aa7c9a05b5b75ac1cd8e317c98398d37aba3a4c7b5d8ec",
+                    "nonce" : "0x984cd5a16c39cece",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x026cebb8d43d89b2d2e00f3dc3429d5c323e6509d4d436563cdb84b3d6ecf6e8",
+                    "stateRoot" : "0x4c799427864af9bfef3ac7448d09b687122af0b12ea08adcd3daf1c35e766dbc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7f0eb3cfe7a31e0e547eae5e53f52227b57bf8af95287fa860afb472db724a80",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c799427864af9bfef3ac7448d09b687122af0b12ea08adcd3daf1c35e766dbca07f0eb3cfe7a31e0e547eae5e53f52227b57bf8af95287fa860afb472db724a80a0026cebb8d43d89b2d2e00f3dc3429d5c323e6509d4d436563cdb84b3d6ecf6e8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4d98203e880a0cd90a21bf95c996973aa7c9a05b5b75ac1cd8e317c98398d37aba3a4c7b5d8ec88984cd5a16c39cecef8e4f8e280018301adb094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ba0b34da9d6bf05106b29e53abc36e611bc8e4eb891c9e165f1e69f150d53f0d7b6a03c8c907ea86f66a6e0be0697c7b10a3b07776485eda02b988624bb72457820fbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb34da9d6bf05106b29e53abc36e611bc8e4eb891c9e165f1e69f150d53f0d7b6",
+                        "s" : "0x3c8c907ea86f66a6e0be0697c7b10a3b07776485eda02b988624bb72457820fb",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa23e703641fcf77750156268a4e3c6fe7a73f44b42c4a87bebf7de7d8aff33ea",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf4d9",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b27",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d6g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g2v0Filler.json",
+            "sourceHash" : "0d653e9ccc8dceef0b0a2038be24b94aa8eec0d3bff73d1bfef11f4d3471fd29"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba0e",
+                    "hash" : "0x227d9049a2b98519af8df4915a1003da0ac9a42737903642acd423ac3f8fbeaa",
+                    "mixHash" : "0x8321232282933c84461af7d26d6dcd9cea5550cfdffec7b0820df6a5898f4952",
+                    "nonce" : "0x4c1b35cb84f2313e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xe75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084",
+                    "stateRoot" : "0xad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7f0eb3cfe7a31e0e547eae5e53f52227b57bf8af95287fa860afb472db724a80",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa07f0eb3cfe7a31e0e547eae5e53f52227b57bf8af95287fa860afb472db724a80a0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a08321232282933c84461af7d26d6dcd9cea5550cfdffec7b0820df6a5898f4952884c1b35cb84f2313ef8e4f8e280018301adb094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ba0b34da9d6bf05106b29e53abc36e611bc8e4eb891c9e165f1e69f150d53f0d7b6a03c8c907ea86f66a6e0be0697c7b10a3b07776485eda02b988624bb72457820fbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb34da9d6bf05106b29e53abc36e611bc8e4eb891c9e165f1e69f150d53f0d7b6",
+                        "s" : "0x3c8c907ea86f66a6e0be0697c7b10a3b07776485eda02b988624bb72457820fb",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x227d9049a2b98519af8df4915a1003da0ac9a42737903642acd423ac3f8fbeaa",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba0e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45f2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d6g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g2v0Filler.json",
+            "sourceHash" : "0d653e9ccc8dceef0b0a2038be24b94aa8eec0d3bff73d1bfef11f4d3471fd29"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba0e",
+                    "hash" : "0x3c0b5ebd51bb3e6008c9d195a34677cc81eb8e4e89414514953b55c391f69ad6",
+                    "mixHash" : "0xa0f414b7896972fe505f413f6b9b47727a8b3d5c3942d76a48d132274e5c25cd",
+                    "nonce" : "0xaec538892b94221e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xe75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084",
+                    "stateRoot" : "0xad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7f0eb3cfe7a31e0e547eae5e53f52227b57bf8af95287fa860afb472db724a80",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa07f0eb3cfe7a31e0e547eae5e53f52227b57bf8af95287fa860afb472db724a80a0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a0a0f414b7896972fe505f413f6b9b47727a8b3d5c3942d76a48d132274e5c25cd88aec538892b94221ef8e4f8e280018301adb094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ba0b34da9d6bf05106b29e53abc36e611bc8e4eb891c9e165f1e69f150d53f0d7b6a03c8c907ea86f66a6e0be0697c7b10a3b07776485eda02b988624bb72457820fbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb34da9d6bf05106b29e53abc36e611bc8e4eb891c9e165f1e69f150d53f0d7b6",
+                        "s" : "0x3c8c907ea86f66a6e0be0697c7b10a3b07776485eda02b988624bb72457820fb",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3c0b5ebd51bb3e6008c9d195a34677cc81eb8e4e89414514953b55c391f69ad6",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba0e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45f2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g3v0.json
index 7a73a41bf..4934b7b02 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g3v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d6g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g3v0Filler.json",
+            "sourceHash" : "7487ee922e4c156d3cd3a2088da790ae0a6d101a3d361888f933cc5ed2b2684d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4d9",
+                    "hash" : "0xa0aa122a2b89b88ac21be96ef43029f8567c051b9737964ed557657607205d34",
+                    "mixHash" : "0xb17be90e39323261cd570017ee300f70c38ae40a0ae946368998847efc2ece3c",
+                    "nonce" : "0x6f75cccad0e7bd43",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x026cebb8d43d89b2d2e00f3dc3429d5c323e6509d4d436563cdb84b3d6ecf6e8",
+                    "stateRoot" : "0x4c799427864af9bfef3ac7448d09b687122af0b12ea08adcd3daf1c35e766dbc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1287b04899b78c898fbe7acdd6ec3fb359b92a6d2ad96935a57406f90d65dafc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c799427864af9bfef3ac7448d09b687122af0b12ea08adcd3daf1c35e766dbca01287b04899b78c898fbe7acdd6ec3fb359b92a6d2ad96935a57406f90d65dafca0026cebb8d43d89b2d2e00f3dc3429d5c323e6509d4d436563cdb84b3d6ecf6e8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4d98203e880a0b17be90e39323261cd570017ee300f70c38ae40a0ae946368998847efc2ece3c886f75cccad0e7bd43f8e4f8e2800183030d4094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ba0bbc26050a29b866917b84cc13949234a1af30c336bb77bd35e21a42351317b9ca009cb3708e5575d000a96940d6783604f0a2c2a68135601666b3b4050e4a841a8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbbc26050a29b866917b84cc13949234a1af30c336bb77bd35e21a42351317b9c",
+                        "s" : "0x09cb3708e5575d000a96940d6783604f0a2c2a68135601666b3b4050e4a841a8",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa0aa122a2b89b88ac21be96ef43029f8567c051b9737964ed557657607205d34",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf4d9",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b27",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d6g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g3v0Filler.json",
+            "sourceHash" : "7487ee922e4c156d3cd3a2088da790ae0a6d101a3d361888f933cc5ed2b2684d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba0e",
+                    "hash" : "0x21d67fe882dee331c2513a27b10da235165554f9423686ebb349b4db1ae4b97a",
+                    "mixHash" : "0xe90adf6e264bb4fc32489c5e1d9e5b17867af2177b30516b2d359282e79f408d",
+                    "nonce" : "0x51c76a4c09d59d50",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xe75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084",
+                    "stateRoot" : "0xad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1287b04899b78c898fbe7acdd6ec3fb359b92a6d2ad96935a57406f90d65dafc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa01287b04899b78c898fbe7acdd6ec3fb359b92a6d2ad96935a57406f90d65dafca0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a0e90adf6e264bb4fc32489c5e1d9e5b17867af2177b30516b2d359282e79f408d8851c76a4c09d59d50f8e4f8e2800183030d4094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ba0bbc26050a29b866917b84cc13949234a1af30c336bb77bd35e21a42351317b9ca009cb3708e5575d000a96940d6783604f0a2c2a68135601666b3b4050e4a841a8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbbc26050a29b866917b84cc13949234a1af30c336bb77bd35e21a42351317b9c",
+                        "s" : "0x09cb3708e5575d000a96940d6783604f0a2c2a68135601666b3b4050e4a841a8",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x21d67fe882dee331c2513a27b10da235165554f9423686ebb349b4db1ae4b97a",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba0e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45f2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d6g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g3v0Filler.json",
+            "sourceHash" : "7487ee922e4c156d3cd3a2088da790ae0a6d101a3d361888f933cc5ed2b2684d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba0e",
+                    "hash" : "0x2cc38064f6fd3f9401b1edb4dc43ea485ab53f8205dc0da9a53f7793ce9cce45",
+                    "mixHash" : "0xc7ea1d605c2ad1221b968d4caea7e34074fa4ebe8a91bcc183cf4d9803f2eb84",
+                    "nonce" : "0xb36ee252fb94ccce",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xe75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084",
+                    "stateRoot" : "0xad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1287b04899b78c898fbe7acdd6ec3fb359b92a6d2ad96935a57406f90d65dafc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa01287b04899b78c898fbe7acdd6ec3fb359b92a6d2ad96935a57406f90d65dafca0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a0c7ea1d605c2ad1221b968d4caea7e34074fa4ebe8a91bcc183cf4d9803f2eb8488b36ee252fb94cccef8e4f8e2800183030d4094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ba0bbc26050a29b866917b84cc13949234a1af30c336bb77bd35e21a42351317b9ca009cb3708e5575d000a96940d6783604f0a2c2a68135601666b3b4050e4a841a8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbbc26050a29b866917b84cc13949234a1af30c336bb77bd35e21a42351317b9c",
+                        "s" : "0x09cb3708e5575d000a96940d6783604f0a2c2a68135601666b3b4050e4a841a8",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2cc38064f6fd3f9401b1edb4dc43ea485ab53f8205dc0da9a53f7793ce9cce45",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba0e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45f2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g0v0.json
index bc6efe4bb..cb25265dd 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d7g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g0v0Filler.json",
             "sourceHash" : "89e0db666480ac9de47e88a8cdc7208c977d34b2b4107abae2a184de73032353"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xf45e",
-                    "hash" : "0x38ebdd1a76b589c2915944e4f96d2e2bf8eed9847399f7293010abb792de849a",
-                    "mixHash" : "0x7c90e00a01cc28fa74acf2169a4996037f1da0761889a9e98ac4ce9253377314",
-                    "nonce" : "0x5b191634aba896d6",
+                    "hash" : "0x4e48cb8fa51f9ed6521d5c3a17bf6f9d0ad013bc06bd350e8840ab244fe44f0a",
+                    "mixHash" : "0x00a1027812151ac284c02ca6949a572bb5e064758d4c50f374f540213e39f7e4",
+                    "nonce" : "0x7579a109f0855027",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x6fdb43df36d747e422af96989f89567e9bf2f218420416bab10ebac8cdd550a0",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x9b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fde",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05055712747050caa6fec3bf885fadad63a6b271925b89006df05cdd7b4568496a09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea06fdb43df36d747e422af96989f89567e9bf2f218420416bab10ebac8cdd550a0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f45e8203e880a07c90e00a01cc28fa74acf2169a4996037f1da0761889a9e98ac4ce9253377314885b191634aba896d6f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05055712747050caa6fec3bf885fadad63a6b271925b89006df05cdd7b4568496a09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea06fdb43df36d747e422af96989f89567e9bf2f218420416bab10ebac8cdd550a0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f45e8203e880a000a1027812151ac284c02ca6949a572bb5e064758d4c50f374f540213e39f7e4887579a109f0855027f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x38ebdd1a76b589c2915944e4f96d2e2bf8eed9847399f7293010abb792de849a",
+        "lastblockhash" : "0x4e48cb8fa51f9ed6521d5c3a17bf6f9d0ad013bc06bd350e8840ab244fe44f0a",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,8 +111,8 @@
     "modexp_d7g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g0v0Filler.json",
             "sourceHash" : "89e0db666480ac9de47e88a8cdc7208c977d34b2b4107abae2a184de73032353"
         },
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb993",
-                    "hash" : "0xf3d0f25c6c6947e45502bc4ff0f9ab333698178b8ad9afc0592f11ce879911de",
-                    "mixHash" : "0x6eadc049c5fc80d0665d09ba36718013e13965bdd8240a7ccdf91cb17646fafc",
-                    "nonce" : "0x52f75864af3a5807",
+                    "hash" : "0x477b887d756348208c23dc987c32d5f21bc32fa2aaccfdfeac0d59c2da91fb29",
+                    "mixHash" : "0x90ce91e8de1ceb97f23054c6e04aed05d4e054f5a789b66451a2dea6bbfea063",
+                    "nonce" : "0xa32e8cde0ec5427a",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0x9b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fde",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a06eadc049c5fc80d0665d09ba36718013e13965bdd8240a7ccdf91cb17646fafc8852f75864af3a5807f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a090ce91e8de1ceb97f23054c6e04aed05d4e054f5a789b66451a2dea6bbfea06388a32e8cde0ec5427af8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3d0f25c6c6947e45502bc4ff0f9ab333698178b8ad9afc0592f11ce879911de",
+        "lastblockhash" : "0x477b887d756348208c23dc987c32d5f21bc32fa2aaccfdfeac0d59c2da91fb29",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -219,8 +219,8 @@
     "modexp_d7g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g0v0Filler.json",
             "sourceHash" : "89e0db666480ac9de47e88a8cdc7208c977d34b2b4107abae2a184de73032353"
         },
@@ -233,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb993",
-                    "hash" : "0xb36580cb35ad459c0441f98d33bb34db0579bad772ea633b0b719f265be75658",
-                    "mixHash" : "0xf566e7c3f7f1585ad7d57836b19f365f5d341d7fd5ca95fae01ed6ec66310910",
-                    "nonce" : "0x6f026790f780a686",
+                    "hash" : "0x6ef985b492da9c050834d2c1717b3531c54bd9f3ec1fe0e1ba2bcf29e2db0941",
+                    "mixHash" : "0x1e0a8549fc7f5e4b51680e6ce10a46fc32f71bb61a137b759fdcf21ccd66af5c",
+                    "nonce" : "0xb7b1efe8f78fe3c7",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
@@ -244,7 +244,7 @@
                     "transactionsTrie" : "0x9b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fde",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a0f566e7c3f7f1585ad7d57836b19f365f5d341d7fd5ca95fae01ed6ec66310910886f026790f780a686f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a01e0a8549fc7f5e4b51680e6ce10a46fc32f71bb61a137b759fdcf21ccd66af5c88b7b1efe8f78fe3c7f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
@@ -281,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb36580cb35ad459c0441f98d33bb34db0579bad772ea633b0b719f265be75658",
+        "lastblockhash" : "0x6ef985b492da9c050834d2c1717b3531c54bd9f3ec1fe0e1ba2bcf29e2db0941",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g1v0.json
index 7a73a41bf..95653f221 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g1v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d7g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g1v0Filler.json",
+            "sourceHash" : "6ecc4e56a4882869eeda124ba5236e008cc9258ecdb2f70f7f51004dac951c56"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf45e",
+                    "hash" : "0xaa17bfc21b3b848fb690eee859116b2484db295f2f0dd6a9afa7288f7307a879",
+                    "mixHash" : "0x534af77719654f04bdeaff5e6bf2c5de97cd294fae174159e2fe9bc77ac63672",
+                    "nonce" : "0xa302a16b3edbe4db",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x6fdb43df36d747e422af96989f89567e9bf2f218420416bab10ebac8cdd550a0",
+                    "stateRoot" : "0x5055712747050caa6fec3bf885fadad63a6b271925b89006df05cdd7b4568496",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaaeb8fd73fb5bb72ea43a20ff88acabc35d39f89d4bb7a745bef750f856c77aa",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05055712747050caa6fec3bf885fadad63a6b271925b89006df05cdd7b4568496a0aaeb8fd73fb5bb72ea43a20ff88acabc35d39f89d4bb7a745bef750f856c77aaa06fdb43df36d747e422af96989f89567e9bf2f218420416bab10ebac8cdd550a0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f45e8203e880a0534af77719654f04bdeaff5e6bf2c5de97cd294fae174159e2fe9bc77ac6367288a302a16b3edbe4dbf8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ca084be943c5246f7d14ebb038636df7ae482718ff98df41cde952f91643438f7a7a035c1ecf0a7315718c46e86358e18bb1a91ebaff9760d0a75b089bca0d77dc025c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x84be943c5246f7d14ebb038636df7ae482718ff98df41cde952f91643438f7a7",
+                        "s" : "0x35c1ecf0a7315718c46e86358e18bb1a91ebaff9760d0a75b089bca0d77dc025",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaa17bfc21b3b848fb690eee859116b2484db295f2f0dd6a9afa7288f7307a879",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf45e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0ba2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d7g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g1v0Filler.json",
+            "sourceHash" : "6ecc4e56a4882869eeda124ba5236e008cc9258ecdb2f70f7f51004dac951c56"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0x5a002b9fe21f4d8a377fe51cb725a3907dad225fbfa32573ba53f3fc21b2c1e2",
+                    "mixHash" : "0xbff169a95b5aa688b415df46b3ace7939622435f162c07f75565dab4cbb7d161",
+                    "nonce" : "0xaa7fe6f49abd43cf",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaaeb8fd73fb5bb72ea43a20ff88acabc35d39f89d4bb7a745bef750f856c77aa",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a0aaeb8fd73fb5bb72ea43a20ff88acabc35d39f89d4bb7a745bef750f856c77aaa0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a0bff169a95b5aa688b415df46b3ace7939622435f162c07f75565dab4cbb7d16188aa7fe6f49abd43cff8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ca084be943c5246f7d14ebb038636df7ae482718ff98df41cde952f91643438f7a7a035c1ecf0a7315718c46e86358e18bb1a91ebaff9760d0a75b089bca0d77dc025c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x84be943c5246f7d14ebb038636df7ae482718ff98df41cde952f91643438f7a7",
+                        "s" : "0x35c1ecf0a7315718c46e86358e18bb1a91ebaff9760d0a75b089bca0d77dc025",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5a002b9fe21f4d8a377fe51cb725a3907dad225fbfa32573ba53f3fc21b2c1e2",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b993",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f466d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d7g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g1v0Filler.json",
+            "sourceHash" : "6ecc4e56a4882869eeda124ba5236e008cc9258ecdb2f70f7f51004dac951c56"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0x2ef4da3173da0f11b844627be8a3a40c0781c157246a832a918c754a65e4581f",
+                    "mixHash" : "0x30cf8385fa3e14ca00ae2be7a3bca24a836776dbb71c62d4df0a8f8aa72879e6",
+                    "nonce" : "0x853be4275ea9ff7f",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xaaeb8fd73fb5bb72ea43a20ff88acabc35d39f89d4bb7a745bef750f856c77aa",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a0aaeb8fd73fb5bb72ea43a20ff88acabc35d39f89d4bb7a745bef750f856c77aaa0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a030cf8385fa3e14ca00ae2be7a3bca24a836776dbb71c62d4df0a8f8aa72879e688853be4275ea9ff7ff8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ca084be943c5246f7d14ebb038636df7ae482718ff98df41cde952f91643438f7a7a035c1ecf0a7315718c46e86358e18bb1a91ebaff9760d0a75b089bca0d77dc025c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x84be943c5246f7d14ebb038636df7ae482718ff98df41cde952f91643438f7a7",
+                        "s" : "0x35c1ecf0a7315718c46e86358e18bb1a91ebaff9760d0a75b089bca0d77dc025",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2ef4da3173da0f11b844627be8a3a40c0781c157246a832a918c754a65e4581f",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b993",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f466d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g2v0.json
index 7a73a41bf..72a2b4981 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g2v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d7g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g2v0Filler.json",
+            "sourceHash" : "f0c94a823e3b25508441b4f2bb116e1196ebeb0917c2d34354cb006fbc8eeb7f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf45e",
+                    "hash" : "0xddcecef00850184ed764b4ef8c7d02e8b8bfb8b20e6df047b873e997cc6c5560",
+                    "mixHash" : "0xf320584f7cbe49dc994e0dfa2cac795a8fffb16b0f063db31721ce27ce945664",
+                    "nonce" : "0xefaef1c8fcb37fc5",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x6fdb43df36d747e422af96989f89567e9bf2f218420416bab10ebac8cdd550a0",
+                    "stateRoot" : "0x5055712747050caa6fec3bf885fadad63a6b271925b89006df05cdd7b4568496",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3b14df28129c25d86d56ba07b735476b94c118869e979b38bd756987e1560eac",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05055712747050caa6fec3bf885fadad63a6b271925b89006df05cdd7b4568496a03b14df28129c25d86d56ba07b735476b94c118869e979b38bd756987e1560eaca06fdb43df36d747e422af96989f89567e9bf2f218420416bab10ebac8cdd550a0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f45e8203e880a0f320584f7cbe49dc994e0dfa2cac795a8fffb16b0f063db31721ce27ce94566488efaef1c8fcb37fc5f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ca09adce04a745cdd12612da4318187a1756d990c3cc85e6aa509ca6024aa02c39ba03c6b63f76e3d314610b9310538aa9906924ea7ee98ac2b42b2337a8634695abac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9adce04a745cdd12612da4318187a1756d990c3cc85e6aa509ca6024aa02c39b",
+                        "s" : "0x3c6b63f76e3d314610b9310538aa9906924ea7ee98ac2b42b2337a8634695aba",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xddcecef00850184ed764b4ef8c7d02e8b8bfb8b20e6df047b873e997cc6c5560",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf45e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0ba2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d7g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g2v0Filler.json",
+            "sourceHash" : "f0c94a823e3b25508441b4f2bb116e1196ebeb0917c2d34354cb006fbc8eeb7f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0xcf42fe13d9471f93ea40a8b09c49133f7e500c04c723031a92c70a0fb3e900f1",
+                    "mixHash" : "0x791f9abb9bf033ff1c97d92e0c04a0582311bcf7df0b1152877315e82a507df8",
+                    "nonce" : "0x3ed7abff917d1d7e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3b14df28129c25d86d56ba07b735476b94c118869e979b38bd756987e1560eac",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a03b14df28129c25d86d56ba07b735476b94c118869e979b38bd756987e1560eaca0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a0791f9abb9bf033ff1c97d92e0c04a0582311bcf7df0b1152877315e82a507df8883ed7abff917d1d7ef8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ca09adce04a745cdd12612da4318187a1756d990c3cc85e6aa509ca6024aa02c39ba03c6b63f76e3d314610b9310538aa9906924ea7ee98ac2b42b2337a8634695abac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9adce04a745cdd12612da4318187a1756d990c3cc85e6aa509ca6024aa02c39b",
+                        "s" : "0x3c6b63f76e3d314610b9310538aa9906924ea7ee98ac2b42b2337a8634695aba",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcf42fe13d9471f93ea40a8b09c49133f7e500c04c723031a92c70a0fb3e900f1",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b993",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f466d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d7g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g2v0Filler.json",
+            "sourceHash" : "f0c94a823e3b25508441b4f2bb116e1196ebeb0917c2d34354cb006fbc8eeb7f"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0xb5fc0befb22a282b5f3a41ea1e5fb0328b8b4c64c11142f44102f9ad698a85ac",
+                    "mixHash" : "0x78a4fd7dc290f8f4bda0fea90a0f708ca04a3342bb94323d7de6d85f6570d933",
+                    "nonce" : "0x10c0790579629ada",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3b14df28129c25d86d56ba07b735476b94c118869e979b38bd756987e1560eac",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a03b14df28129c25d86d56ba07b735476b94c118869e979b38bd756987e1560eaca0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a078a4fd7dc290f8f4bda0fea90a0f708ca04a3342bb94323d7de6d85f6570d9338810c0790579629adaf8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ca09adce04a745cdd12612da4318187a1756d990c3cc85e6aa509ca6024aa02c39ba03c6b63f76e3d314610b9310538aa9906924ea7ee98ac2b42b2337a8634695abac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9adce04a745cdd12612da4318187a1756d990c3cc85e6aa509ca6024aa02c39b",
+                        "s" : "0x3c6b63f76e3d314610b9310538aa9906924ea7ee98ac2b42b2337a8634695aba",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb5fc0befb22a282b5f3a41ea1e5fb0328b8b4c64c11142f44102f9ad698a85ac",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b993",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f466d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g3v0.json
index 7a73a41bf..516c9839a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g3v0.json
@@ -1,2 +1,327 @@
 {
+    "modexp_d7g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g3v0Filler.json",
+            "sourceHash" : "a94e3296ddc80eef8fcf8b238101db4203096bc3f09447541ddef52b2e71784e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf45e",
+                    "hash" : "0xaea1cc3350c0e77266bc1df093a888ef5c741bffd88df141ff1458c91d16ea3a",
+                    "mixHash" : "0x83059354c540377e84415c669d69fada91f01ad15724118a58857e954841ba27",
+                    "nonce" : "0x3fc19532bb8bc97d",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x6fdb43df36d747e422af96989f89567e9bf2f218420416bab10ebac8cdd550a0",
+                    "stateRoot" : "0x5055712747050caa6fec3bf885fadad63a6b271925b89006df05cdd7b4568496",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8829b2b4593552c3f0e5b51fe7ca121b0f786407976119a84c39b4b818226c84",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05055712747050caa6fec3bf885fadad63a6b271925b89006df05cdd7b4568496a08829b2b4593552c3f0e5b51fe7ca121b0f786407976119a84c39b4b818226c84a06fdb43df36d747e422af96989f89567e9bf2f218420416bab10ebac8cdd550a0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f45e8203e880a083059354c540377e84415c669d69fada91f01ad15724118a58857e954841ba27883fc19532bb8bc97df8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ca0ece129ecb03638139ce470a8819e485222a505fcaa539b42e1c202ea65974099a075af89d265e00cf07e6f3e7800b9c25b1cbc0bc7b2e5a2ce929a4425d30e597bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xece129ecb03638139ce470a8819e485222a505fcaa539b42e1c202ea65974099",
+                        "s" : "0x75af89d265e00cf07e6f3e7800b9c25b1cbc0bc7b2e5a2ce929a4425d30e597b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaea1cc3350c0e77266bc1df093a888ef5c741bffd88df141ff1458c91d16ea3a",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cf45e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0ba2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d7g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g3v0Filler.json",
+            "sourceHash" : "a94e3296ddc80eef8fcf8b238101db4203096bc3f09447541ddef52b2e71784e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0x473a118d8c520bd7ffa82cd1b072831983616fa19bf05fff996ff8f2a87e1e82",
+                    "mixHash" : "0xc86e32ee3fab01b1331fc9c99c63e4c8f335a8ea2128a59f3ac66aea5d3047b3",
+                    "nonce" : "0xd2286e5cfaff8d69",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8829b2b4593552c3f0e5b51fe7ca121b0f786407976119a84c39b4b818226c84",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a08829b2b4593552c3f0e5b51fe7ca121b0f786407976119a84c39b4b818226c84a0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a0c86e32ee3fab01b1331fc9c99c63e4c8f335a8ea2128a59f3ac66aea5d3047b388d2286e5cfaff8d69f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ca0ece129ecb03638139ce470a8819e485222a505fcaa539b42e1c202ea65974099a075af89d265e00cf07e6f3e7800b9c25b1cbc0bc7b2e5a2ce929a4425d30e597bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xece129ecb03638139ce470a8819e485222a505fcaa539b42e1c202ea65974099",
+                        "s" : "0x75af89d265e00cf07e6f3e7800b9c25b1cbc0bc7b2e5a2ce929a4425d30e597b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x473a118d8c520bd7ffa82cd1b072831983616fa19bf05fff996ff8f2a87e1e82",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b993",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f466d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d7g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g3v0Filler.json",
+            "sourceHash" : "a94e3296ddc80eef8fcf8b238101db4203096bc3f09447541ddef52b2e71784e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0x14e0532d6fad41ba3dfbf8e7c2046c2464efa3f7e891eadebadd12ac546ac561",
+                    "mixHash" : "0x81589d556193b92d9d25d8a91b62f0d3637031a47f1e7009a6480379487f48a5",
+                    "nonce" : "0xf8b814834f821b32",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8829b2b4593552c3f0e5b51fe7ca121b0f786407976119a84c39b4b818226c84",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a08829b2b4593552c3f0e5b51fe7ca121b0f786407976119a84c39b4b818226c84a0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a081589d556193b92d9d25d8a91b62f0d3637031a47f1e7009a6480379487f48a588f8b814834f821b32f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ca0ece129ecb03638139ce470a8819e485222a505fcaa539b42e1c202ea65974099a075af89d265e00cf07e6f3e7800b9c25b1cbc0bc7b2e5a2ce929a4425d30e597bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xece129ecb03638139ce470a8819e485222a505fcaa539b42e1c202ea65974099",
+                        "s" : "0x75af89d265e00cf07e6f3e7800b9c25b1cbc0bc7b2e5a2ce929a4425d30e597b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x14e0532d6fad41ba3dfbf8e7c2046c2464efa3f7e891eadebadd12ac546ac561",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b993",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f466d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g0v0.json
index 088ab5b53..9e5dfcaed 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d8g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g0v0Filler.json",
             "sourceHash" : "f9577d5b68474ca9f3991891ec4adbea8cffaea427f3a97088a8081336c0ea49"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb986",
-                    "hash" : "0x1ba72c231c5c29287562985bb447602e879ad93b82cd382a2ae167be4982b4b8",
-                    "mixHash" : "0x01254c39d8a66973562c2d2b2add22af32781299a54f999cc283cc7357494330",
-                    "nonce" : "0x17fa9a83a495a2a5",
+                    "hash" : "0x1441fb08c93dba65e74176cbd746cb081ba10fa138fd2a3aecf8197749eefde3",
+                    "mixHash" : "0x358fb54e12290b61a2217a9ccd793fcbbf7683f4f603f824d5e0fa768fea7bf1",
+                    "nonce" : "0xf3952ccf8f78cbe0",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x4b0771b165a0b69b612c0a4f354e74512ca13182de5e6f9aec39a0b18fe05fa2",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xc57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3871335e8aa595da7a15253f95bbe27546c97a6462c811940e30ad2c7ac285fa0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba04b0771b165a0b69b612c0a4f354e74512ca13182de5e6f9aec39a0b18fe05fa2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9868203e880a001254c39d8a66973562c2d2b2add22af32781299a54f999cc283cc73574943308817fa9a83a495a2a5f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3871335e8aa595da7a15253f95bbe27546c97a6462c811940e30ad2c7ac285fa0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba04b0771b165a0b69b612c0a4f354e74512ca13182de5e6f9aec39a0b18fe05fa2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9868203e880a0358fb54e12290b61a2217a9ccd793fcbbf7683f4f603f824d5e0fa768fea7bf188f3952ccf8f78cbe0f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ba72c231c5c29287562985bb447602e879ad93b82cd382a2ae167be4982b4b8",
+        "lastblockhash" : "0x1441fb08c93dba65e74176cbd746cb081ba10fa138fd2a3aecf8197749eefde3",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d8g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g0v0Filler.json",
             "sourceHash" : "f9577d5b68474ca9f3991891ec4adbea8cffaea427f3a97088a8081336c0ea49"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb953",
-                    "hash" : "0xb345b72186146653a0fea78ab6c090082c230c44546cc8ce5fd621259bfb60f1",
-                    "mixHash" : "0xea1b278a61b7a1e1d94f3cb22a1e254f0df80db434b2518c04ccbb274fa4771a",
-                    "nonce" : "0x593657ed9c2b735e",
+                    "hash" : "0xa57f3900f34c3462190175337b2af577dd5a652bb6bb6c04318620b800f37afa",
+                    "mixHash" : "0x3d4321c6003821d2d37d10db251c91d7d0d20b8135ec23f34fbcccd2febafc9c",
+                    "nonce" : "0x3f2729917271d610",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x54c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0xc57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a0ea1b278a61b7a1e1d94f3cb22a1e254f0df80db434b2518c04ccbb274fa4771a88593657ed9c2b735ef8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a03d4321c6003821d2d37d10db251c91d7d0d20b8135ec23f34fbcccd2febafc9c883f2729917271d610f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb345b72186146653a0fea78ab6c090082c230c44546cc8ce5fd621259bfb60f1",
+        "lastblockhash" : "0xa57f3900f34c3462190175337b2af577dd5a652bb6bb6c04318620b800f37afa",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d8g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g0v0Filler.json",
             "sourceHash" : "f9577d5b68474ca9f3991891ec4adbea8cffaea427f3a97088a8081336c0ea49"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb953",
-                    "hash" : "0x5528b1b87b622bf2324fd019d87c513859a87b85d057fc698fb9acc4bebfbfb1",
-                    "mixHash" : "0x61327871a5ec86cd0e50ba8692de0b726864a0f8dfd79cd54afcae222754f08b",
-                    "nonce" : "0x9fc13fa4ca505fdb",
+                    "hash" : "0xa4605f05516b14d7b3f272c9f206ac64299c89bc1029cb67162fab31c4b3a5f7",
+                    "mixHash" : "0xfc4ef338c02e184ed40114563beaca348addce7ef7234ee1336c50cdd744ec02",
+                    "nonce" : "0xeb253474bc721a97",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x54c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0xc57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a061327871a5ec86cd0e50ba8692de0b726864a0f8dfd79cd54afcae222754f08b889fc13fa4ca505fdbf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a0fc4ef338c02e184ed40114563beaca348addce7ef7234ee1336c50cdd744ec0288eb253474bc721a97f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5528b1b87b622bf2324fd019d87c513859a87b85d057fc698fb9acc4bebfbfb1",
+        "lastblockhash" : "0xa4605f05516b14d7b3f272c9f206ac64299c89bc1029cb67162fab31c4b3a5f7",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g1v0.json
index 7a73a41bf..106478094 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d8g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g1v0Filler.json",
+            "sourceHash" : "87ac6098d552398227a995d74ddb46f8d6c9f0bed3a7ab38222e975ed18ec0c6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb986",
+                    "hash" : "0xaa02b0ec9890c922224b3fecd01b2563909db43220350c3fc8f85c83c73c72e9",
+                    "mixHash" : "0x202456923584f5905c267d94a7f7d3462b96f0f486765370d9f2d20eac42d027",
+                    "nonce" : "0x9f48e565d3e79009",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4b0771b165a0b69b612c0a4f354e74512ca13182de5e6f9aec39a0b18fe05fa2",
+                    "stateRoot" : "0xd3871335e8aa595da7a15253f95bbe27546c97a6462c811940e30ad2c7ac285f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x871c1570a5f806eb5477f98dd06bba3b98e2b9b66cf9b108e42482153e713b32",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3871335e8aa595da7a15253f95bbe27546c97a6462c811940e30ad2c7ac285fa0871c1570a5f806eb5477f98dd06bba3b98e2b9b66cf9b108e42482153e713b32a04b0771b165a0b69b612c0a4f354e74512ca13182de5e6f9aec39a0b18fe05fa2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9868203e880a0202456923584f5905c267d94a7f7d3462b96f0f486765370d9f2d20eac42d027889f48e565d3e79009f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca07250a66bb19804e364e47a808c67b66ef6f844430f56432e63a8772897dd970fa0208b89c015c59eabc7e1d5b49bd0b5008a6862c6d6869078a2cc5a48328238acc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7250a66bb19804e364e47a808c67b66ef6f844430f56432e63a8772897dd970f",
+                        "s" : "0x208b89c015c59eabc7e1d5b49bd0b5008a6862c6d6869078a2cc5a48328238ac",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaa02b0ec9890c922224b3fecd01b2563909db43220350c3fc8f85c83c73c72e9",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb986",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f467a",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d8g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g1v0Filler.json",
+            "sourceHash" : "87ac6098d552398227a995d74ddb46f8d6c9f0bed3a7ab38222e975ed18ec0c6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb953",
+                    "hash" : "0xb93c0c7407f1df98f0a0a8d1366e0f8952aa94d790230367e5d00e26d4addcf5",
+                    "mixHash" : "0xc8f7f6ec0b49d721c22cddd67edd303882692c26e3ea7f944cc06a66683aa0e4",
+                    "nonce" : "0x1369bd62551aabf7",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x54c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374",
+                    "stateRoot" : "0x4e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x871c1570a5f806eb5477f98dd06bba3b98e2b9b66cf9b108e42482153e713b32",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea0871c1570a5f806eb5477f98dd06bba3b98e2b9b66cf9b108e42482153e713b32a054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a0c8f7f6ec0b49d721c22cddd67edd303882692c26e3ea7f944cc06a66683aa0e4881369bd62551aabf7f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca07250a66bb19804e364e47a808c67b66ef6f844430f56432e63a8772897dd970fa0208b89c015c59eabc7e1d5b49bd0b5008a6862c6d6869078a2cc5a48328238acc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7250a66bb19804e364e47a808c67b66ef6f844430f56432e63a8772897dd970f",
+                        "s" : "0x208b89c015c59eabc7e1d5b49bd0b5008a6862c6d6869078a2cc5a48328238ac",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb93c0c7407f1df98f0a0a8d1366e0f8952aa94d790230367e5d00e26d4addcf5",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b953",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46ad",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d8g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g1v0Filler.json",
+            "sourceHash" : "87ac6098d552398227a995d74ddb46f8d6c9f0bed3a7ab38222e975ed18ec0c6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb953",
+                    "hash" : "0x10b6e249dfd836a64c4434ec6b259d0dd0869ef98b5f316f59b055bb70aa77df",
+                    "mixHash" : "0x150b7c193efe44ed4db789a6435f1ec050e410015de21f8bda48dd0ee36889d0",
+                    "nonce" : "0xa6daff90f759b268",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x54c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374",
+                    "stateRoot" : "0x4e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x871c1570a5f806eb5477f98dd06bba3b98e2b9b66cf9b108e42482153e713b32",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea0871c1570a5f806eb5477f98dd06bba3b98e2b9b66cf9b108e42482153e713b32a054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a0150b7c193efe44ed4db789a6435f1ec050e410015de21f8bda48dd0ee36889d088a6daff90f759b268f8c6f8c4800183015f9094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca07250a66bb19804e364e47a808c67b66ef6f844430f56432e63a8772897dd970fa0208b89c015c59eabc7e1d5b49bd0b5008a6862c6d6869078a2cc5a48328238acc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7250a66bb19804e364e47a808c67b66ef6f844430f56432e63a8772897dd970f",
+                        "s" : "0x208b89c015c59eabc7e1d5b49bd0b5008a6862c6d6869078a2cc5a48328238ac",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x10b6e249dfd836a64c4434ec6b259d0dd0869ef98b5f316f59b055bb70aa77df",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b953",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46ad",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g2v0.json
index 7a73a41bf..e1a13d9d6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d8g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g2v0Filler.json",
+            "sourceHash" : "2fe8cee532d64e0b292ad10660a1f3e73936c7a994cceef2bb778a2e22c2e1c1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb986",
+                    "hash" : "0x3209a9d5ec7333660b14da28d09a60e765b4f58d3a1ed9f4a65d1953d78c6388",
+                    "mixHash" : "0xa04470aadfc1cff6ed4026dba4a8079ff4343d3095c92820893fbb256ac17695",
+                    "nonce" : "0x9234570041344cd0",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4b0771b165a0b69b612c0a4f354e74512ca13182de5e6f9aec39a0b18fe05fa2",
+                    "stateRoot" : "0xd3871335e8aa595da7a15253f95bbe27546c97a6462c811940e30ad2c7ac285f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x31db654f4b49f2ec25ff14d17ecff0a3f59364e4311ee0b3e3f84d386743276e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3871335e8aa595da7a15253f95bbe27546c97a6462c811940e30ad2c7ac285fa031db654f4b49f2ec25ff14d17ecff0a3f59364e4311ee0b3e3f84d386743276ea04b0771b165a0b69b612c0a4f354e74512ca13182de5e6f9aec39a0b18fe05fa2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9868203e880a0a04470aadfc1cff6ed4026dba4a8079ff4343d3095c92820893fbb256ac17695889234570041344cd0f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca028178bbcceda207e795be0e16642f35e0e0853279d56f121a0d17f88344c0381a0695fa22e576af027ccaac41074df312f194d2a2beff6f5da4835059dd3e4d835c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x28178bbcceda207e795be0e16642f35e0e0853279d56f121a0d17f88344c0381",
+                        "s" : "0x695fa22e576af027ccaac41074df312f194d2a2beff6f5da4835059dd3e4d835",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3209a9d5ec7333660b14da28d09a60e765b4f58d3a1ed9f4a65d1953d78c6388",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb986",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f467a",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d8g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g2v0Filler.json",
+            "sourceHash" : "2fe8cee532d64e0b292ad10660a1f3e73936c7a994cceef2bb778a2e22c2e1c1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb953",
+                    "hash" : "0xf62498aa410de537269b9fc1f39f492c447a1cd1d23f9c2263546ac3e4213769",
+                    "mixHash" : "0x9d8d5d8632dd5433453bc172247dd10c69b25a97c77ad74797aac94e8b87fdf6",
+                    "nonce" : "0xe9e675f00fdfbb03",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x54c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374",
+                    "stateRoot" : "0x4e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x31db654f4b49f2ec25ff14d17ecff0a3f59364e4311ee0b3e3f84d386743276e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea031db654f4b49f2ec25ff14d17ecff0a3f59364e4311ee0b3e3f84d386743276ea054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a09d8d5d8632dd5433453bc172247dd10c69b25a97c77ad74797aac94e8b87fdf688e9e675f00fdfbb03f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca028178bbcceda207e795be0e16642f35e0e0853279d56f121a0d17f88344c0381a0695fa22e576af027ccaac41074df312f194d2a2beff6f5da4835059dd3e4d835c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x28178bbcceda207e795be0e16642f35e0e0853279d56f121a0d17f88344c0381",
+                        "s" : "0x695fa22e576af027ccaac41074df312f194d2a2beff6f5da4835059dd3e4d835",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf62498aa410de537269b9fc1f39f492c447a1cd1d23f9c2263546ac3e4213769",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b953",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46ad",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d8g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g2v0Filler.json",
+            "sourceHash" : "2fe8cee532d64e0b292ad10660a1f3e73936c7a994cceef2bb778a2e22c2e1c1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb953",
+                    "hash" : "0x4a32aa4391e8ea72a00ab56541f8dd67182ca7ea75ba7f11b501ffe623c77486",
+                    "mixHash" : "0x9e0e51878c62c3468a510f0ab77315df479e6a39a4fdab76ad62127a2a35e3ec",
+                    "nonce" : "0xc8fbe4d78f277140",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x54c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374",
+                    "stateRoot" : "0x4e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x31db654f4b49f2ec25ff14d17ecff0a3f59364e4311ee0b3e3f84d386743276e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea031db654f4b49f2ec25ff14d17ecff0a3f59364e4311ee0b3e3f84d386743276ea054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a09e0e51878c62c3468a510f0ab77315df479e6a39a4fdab76ad62127a2a35e3ec88c8fbe4d78f277140f8c6f8c480018301adb094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca028178bbcceda207e795be0e16642f35e0e0853279d56f121a0d17f88344c0381a0695fa22e576af027ccaac41074df312f194d2a2beff6f5da4835059dd3e4d835c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x28178bbcceda207e795be0e16642f35e0e0853279d56f121a0d17f88344c0381",
+                        "s" : "0x695fa22e576af027ccaac41074df312f194d2a2beff6f5da4835059dd3e4d835",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4a32aa4391e8ea72a00ab56541f8dd67182ca7ea75ba7f11b501ffe623c77486",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b953",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46ad",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g3v0.json
index 7a73a41bf..cd4b0fe9b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d8g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g3v0Filler.json",
+            "sourceHash" : "f6cb796209516f79d5c52a9b96402d9075d562af0d3bc83eb313b44949bd9b56"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb986",
+                    "hash" : "0x93d44b3e4324615c12ebc74d9eec05a05da0a0e70104b0024697a557065c84dc",
+                    "mixHash" : "0x943dac6d75928fe837001de389bfa418d558cd6c81475d23082d35b1b9d1fff6",
+                    "nonce" : "0x2b675c62d830cc09",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x4b0771b165a0b69b612c0a4f354e74512ca13182de5e6f9aec39a0b18fe05fa2",
+                    "stateRoot" : "0xd3871335e8aa595da7a15253f95bbe27546c97a6462c811940e30ad2c7ac285f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x833a1548e29da34f4602e390267251628da9ec86b06eb49be00abbda5727bf05",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3871335e8aa595da7a15253f95bbe27546c97a6462c811940e30ad2c7ac285fa0833a1548e29da34f4602e390267251628da9ec86b06eb49be00abbda5727bf05a04b0771b165a0b69b612c0a4f354e74512ca13182de5e6f9aec39a0b18fe05fa2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9868203e880a0943dac6d75928fe837001de389bfa418d558cd6c81475d23082d35b1b9d1fff6882b675c62d830cc09f8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ba050b45aca34bb4a86cd469569382a875dbaf0a4d7634d5cd7a146419454727fc5a07b051cd6adcd089330162ae54f08f68ad4fe99e966e458a08f35ed18b257d35cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50b45aca34bb4a86cd469569382a875dbaf0a4d7634d5cd7a146419454727fc5",
+                        "s" : "0x7b051cd6adcd089330162ae54f08f68ad4fe99e966e458a08f35ed18b257d35c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x93d44b3e4324615c12ebc74d9eec05a05da0a0e70104b0024697a557065c84dc",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb986",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f467a",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d8g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g3v0Filler.json",
+            "sourceHash" : "f6cb796209516f79d5c52a9b96402d9075d562af0d3bc83eb313b44949bd9b56"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb953",
+                    "hash" : "0x583351f88dbbe1342412dfb6f0b2555fb1e68eba07d4d8668ce12aeae8eaf773",
+                    "mixHash" : "0x6fba3dd16c50667056d3869414a5b0edc9f6a57883ae58508d5fcc63504df15e",
+                    "nonce" : "0xd3d7c855f015180c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x54c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374",
+                    "stateRoot" : "0x4e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x833a1548e29da34f4602e390267251628da9ec86b06eb49be00abbda5727bf05",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea0833a1548e29da34f4602e390267251628da9ec86b06eb49be00abbda5727bf05a054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a06fba3dd16c50667056d3869414a5b0edc9f6a57883ae58508d5fcc63504df15e88d3d7c855f015180cf8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ba050b45aca34bb4a86cd469569382a875dbaf0a4d7634d5cd7a146419454727fc5a07b051cd6adcd089330162ae54f08f68ad4fe99e966e458a08f35ed18b257d35cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50b45aca34bb4a86cd469569382a875dbaf0a4d7634d5cd7a146419454727fc5",
+                        "s" : "0x7b051cd6adcd089330162ae54f08f68ad4fe99e966e458a08f35ed18b257d35c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x583351f88dbbe1342412dfb6f0b2555fb1e68eba07d4d8668ce12aeae8eaf773",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b953",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46ad",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d8g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g3v0Filler.json",
+            "sourceHash" : "f6cb796209516f79d5c52a9b96402d9075d562af0d3bc83eb313b44949bd9b56"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb953",
+                    "hash" : "0xc6a6c4506071b7b58533345d406be2ce66d8ab28f070aae03adc22c57a76c989",
+                    "mixHash" : "0x8edead8f18f6541ef7305397d1c275bba75d725334920860343447a58339e5ac",
+                    "nonce" : "0x240cb335aeed3abd",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x54c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374",
+                    "stateRoot" : "0x4e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x833a1548e29da34f4602e390267251628da9ec86b06eb49be00abbda5727bf05",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea0833a1548e29da34f4602e390267251628da9ec86b06eb49be00abbda5727bf05a054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a08edead8f18f6541ef7305397d1c275bba75d725334920860343447a58339e5ac88240cb335aeed3abdf8c6f8c4800183030d4094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ba050b45aca34bb4a86cd469569382a875dbaf0a4d7634d5cd7a146419454727fc5a07b051cd6adcd089330162ae54f08f68ad4fe99e966e458a08f35ed18b257d35cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50b45aca34bb4a86cd469569382a875dbaf0a4d7634d5cd7a146419454727fc5",
+                        "s" : "0x7b051cd6adcd089330162ae54f08f68ad4fe99e966e458a08f35ed18b257d35c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc6a6c4506071b7b58533345d406be2ce66d8ab28f070aae03adc22c57a76c989",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b953",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46ad",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g0v0.json
index c8dfc6bcb..535853d84 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g0v0.json
@@ -2,8 +2,8 @@
     "modexp_d9g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g0v0Filler.json",
             "sourceHash" : "426e5afe81501cca047bad900ec45db8ca8ed80855adb93905b16570b9bb6132"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0x6eba7feee2e1b36c6711175a477d4a781538b9d78d01ea6e1b8d949414fe584e",
-                    "mixHash" : "0xe555db745da54024c3171d1bfcd601b657d51b5f023a516711ba7e2496be62fa",
-                    "nonce" : "0x878571efdc638e69",
+                    "hash" : "0xbfd0aa76960f8611477ad6c2ca26c9c8822ad714417ad14789bedf846b52b09f",
+                    "mixHash" : "0x22cfc5dba0314598d766e93e6ee56aebd798137f489a7397e5fc8a36089e365c",
+                    "nonce" : "0xe02075474dc5a724",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0e555db745da54024c3171d1bfcd601b657d51b5f023a516711ba7e2496be62fa88878571efdc638e69f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a022cfc5dba0314598d766e93e6ee56aebd798137f489a7397e5fc8a36089e365c88e02075474dc5a724f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6eba7feee2e1b36c6711175a477d4a781538b9d78d01ea6e1b8d949414fe584e",
+        "lastblockhash" : "0xbfd0aa76960f8611477ad6c2ca26c9c8822ad714417ad14789bedf846b52b09f",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -110,8 +110,8 @@
     "modexp_d9g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g0v0Filler.json",
             "sourceHash" : "426e5afe81501cca047bad900ec45db8ca8ed80855adb93905b16570b9bb6132"
         },
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0x2d8a72ab201a5836a2bed78cad5f8596a3ae9828afb31f10c2a426691da9eac7",
-                    "mixHash" : "0x49e4502ddb13686b2eea8a6ffb78e8d41cc7ca1629361a5b0be93f5638366611",
-                    "nonce" : "0x678e776f9b4896ac",
+                    "hash" : "0xe527107937006644890f6974cee980887789bee4b168c3006d7ddfe8251cb7e7",
+                    "mixHash" : "0xc6b7c0077764cfc3ae56affc92be9c5e0904150e652325a7d67a6ddd6ab8b65f",
+                    "nonce" : "0x527e9bac8425d340",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
@@ -135,7 +135,7 @@
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a049e4502ddb13686b2eea8a6ffb78e8d41cc7ca1629361a5b0be93f563836661188678e776f9b4896acf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0c6b7c0077764cfc3ae56affc92be9c5e0904150e652325a7d67a6ddd6ab8b65f88527e9bac8425d340f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2d8a72ab201a5836a2bed78cad5f8596a3ae9828afb31f10c2a426691da9eac7",
+        "lastblockhash" : "0xe527107937006644890f6974cee980887789bee4b168c3006d7ddfe8251cb7e7",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -218,8 +218,8 @@
     "modexp_d9g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g0v0Filler.json",
             "sourceHash" : "426e5afe81501cca047bad900ec45db8ca8ed80855adb93905b16570b9bb6132"
         },
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0x9fd5af968d43cffc4dcc8482e8b6aa7b46671cf2b243001a9de2a12983c519e3",
-                    "mixHash" : "0x85e84afee967180743f80ec70a60210f6599677a091e918ec8b613c7b4768f94",
-                    "nonce" : "0x1a29400267ad7a6c",
+                    "hash" : "0xe8702d4522e30b3747bd7b1f8d4b7bf9119ed2c1b7a920f89c4821c4d10fc722",
+                    "mixHash" : "0x3a6bae7953579f86ad411617501b6cde0ec6020d2681f1cd1222ad74ffde781b",
+                    "nonce" : "0x2c5e65590947e476",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
@@ -243,7 +243,7 @@
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a085e84afee967180743f80ec70a60210f6599677a091e918ec8b613c7b4768f94881a29400267ad7a6cf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a03a6bae7953579f86ad411617501b6cde0ec6020d2681f1cd1222ad74ffde781b882c5e65590947e476f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9fd5af968d43cffc4dcc8482e8b6aa7b46671cf2b243001a9de2a12983c519e3",
+        "lastblockhash" : "0xe8702d4522e30b3747bd7b1f8d4b7bf9119ed2c1b7a920f89c4821c4d10fc722",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g1v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g1v0.json
index 7a73a41bf..04d67313a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g1v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d9g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g1v0Filler.json",
+            "sourceHash" : "ba3b31bae2c22343079c158ab845eda83330d9fd34d67a602f0f0ed9382e15ea"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xd68d4e0614f5d494551574fea37e48754b4adc7c4a56ba894c9a5c9081433015",
+                    "mixHash" : "0x7a273246c65a1835af2bdc7803589fa324cbe04ddb2bf8df5b0d387c860f07b6",
+                    "nonce" : "0x37866a6c7cbe2366",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x4a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbf63e459d6f714706434f793c9f3763bc81d2b85d19fe87dd7dd13b357b8ed2a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a0bf63e459d6f714706434f793c9f3763bc81d2b85d19fe87dd7dd13b357b8ed2aa0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a07a273246c65a1835af2bdc7803589fa324cbe04ddb2bf8df5b0d387c860f07b68837866a6c7cbe2366f8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca07d1ae62ea0af62f5cb2d39a5c670771a0a6b43f96e12e325e859861add051198a04f8424f37ebe9b2b0c541943c13e84c5d1af55cc603ca25745912ea4e7891601c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7d1ae62ea0af62f5cb2d39a5c670771a0a6b43f96e12e325e859861add051198",
+                        "s" : "0x4f8424f37ebe9b2b0c541943c13e84c5d1af55cc603ca25745912ea4e7891601",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd68d4e0614f5d494551574fea37e48754b4adc7c4a56ba894c9a5c9081433015",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d9g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g1v0Filler.json",
+            "sourceHash" : "ba3b31bae2c22343079c158ab845eda83330d9fd34d67a602f0f0ed9382e15ea"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x107a5068301eb2ea176ebb0bc602ac2544da0df433602e3c24d39468eef79f02",
+                    "mixHash" : "0x8deec0563ba58a19875988afbe065b0fb85afb919e9ca6d7983137bbdc35f61e",
+                    "nonce" : "0xa28081e9c4511233",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbf63e459d6f714706434f793c9f3763bc81d2b85d19fe87dd7dd13b357b8ed2a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea0bf63e459d6f714706434f793c9f3763bc81d2b85d19fe87dd7dd13b357b8ed2aa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a08deec0563ba58a19875988afbe065b0fb85afb919e9ca6d7983137bbdc35f61e88a28081e9c4511233f8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca07d1ae62ea0af62f5cb2d39a5c670771a0a6b43f96e12e325e859861add051198a04f8424f37ebe9b2b0c541943c13e84c5d1af55cc603ca25745912ea4e7891601c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7d1ae62ea0af62f5cb2d39a5c670771a0a6b43f96e12e325e859861add051198",
+                        "s" : "0x4f8424f37ebe9b2b0c541943c13e84c5d1af55cc603ca25745912ea4e7891601",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x107a5068301eb2ea176ebb0bc602ac2544da0df433602e3c24d39468eef79f02",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d9g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g1v0Filler.json",
+            "sourceHash" : "ba3b31bae2c22343079c158ab845eda83330d9fd34d67a602f0f0ed9382e15ea"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xb4c82d187797e1622c07031dcd32ab0a3585eb7ade2d72388a09eb9fd4b5a46b",
+                    "mixHash" : "0x12ed0c6c64eb9a026d26634f1e666a35e6bf5f64b7a9d2791a1000c331edbe2f",
+                    "nonce" : "0xe6b9e858efa3da30",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbf63e459d6f714706434f793c9f3763bc81d2b85d19fe87dd7dd13b357b8ed2a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea0bf63e459d6f714706434f793c9f3763bc81d2b85d19fe87dd7dd13b357b8ed2aa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a012ed0c6c64eb9a026d26634f1e666a35e6bf5f64b7a9d2791a1000c331edbe2f88e6b9e858efa3da30f8c5f8c3800183015f9094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca07d1ae62ea0af62f5cb2d39a5c670771a0a6b43f96e12e325e859861add051198a04f8424f37ebe9b2b0c541943c13e84c5d1af55cc603ca25745912ea4e7891601c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7d1ae62ea0af62f5cb2d39a5c670771a0a6b43f96e12e325e859861add051198",
+                        "s" : "0x4f8424f37ebe9b2b0c541943c13e84c5d1af55cc603ca25745912ea4e7891601",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb4c82d187797e1622c07031dcd32ab0a3585eb7ade2d72388a09eb9fd4b5a46b",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g2v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g2v0.json
index 7a73a41bf..de68d0df5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g2v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d9g2v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g2v0Filler.json",
+            "sourceHash" : "0a856b7036d112e2c1b5568a98137497cbc9c9dd35b8bf462ad207449a5e8dd6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x2c917fe71024975da80f5ba1b22e40598f2efb24cbd624ca4d03d3dc040d53d1",
+                    "mixHash" : "0xbb1d72129dff63a2cfc9e59ca90db1c7e2be72a26fd3db91d00927bf09d9a596",
+                    "nonce" : "0x37dc57b8be499033",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x4a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6fe294293379b0877fd61540a7174f5344a6ceaab5315f07c09622edc946996e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a06fe294293379b0877fd61540a7174f5344a6ceaab5315f07c09622edc946996ea0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0bb1d72129dff63a2cfc9e59ca90db1c7e2be72a26fd3db91d00927bf09d9a5968837dc57b8be499033f8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ba0f3f7e192f01c7853e3651cd0d392cf3095ad8c76c2635831bcdb7a0dee721890a0095b22070592a5d0e6f1eceff0329522c2266082124961d30062cf20dac682b9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3f7e192f01c7853e3651cd0d392cf3095ad8c76c2635831bcdb7a0dee721890",
+                        "s" : "0x095b22070592a5d0e6f1eceff0329522c2266082124961d30062cf20dac682b9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2c917fe71024975da80f5ba1b22e40598f2efb24cbd624ca4d03d3dc040d53d1",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d9g2v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g2v0Filler.json",
+            "sourceHash" : "0a856b7036d112e2c1b5568a98137497cbc9c9dd35b8bf462ad207449a5e8dd6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x116662802338f2d960c650e02e432e0f6e8a69e737488be976beec656313ddb7",
+                    "mixHash" : "0x859c1a96a45367abb4c8c7c02ba3270f20b34b169d74ea6ad61edf754be68154",
+                    "nonce" : "0xf1217d4e4a2605ca",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6fe294293379b0877fd61540a7174f5344a6ceaab5315f07c09622edc946996e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea06fe294293379b0877fd61540a7174f5344a6ceaab5315f07c09622edc946996ea07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0859c1a96a45367abb4c8c7c02ba3270f20b34b169d74ea6ad61edf754be6815488f1217d4e4a2605caf8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ba0f3f7e192f01c7853e3651cd0d392cf3095ad8c76c2635831bcdb7a0dee721890a0095b22070592a5d0e6f1eceff0329522c2266082124961d30062cf20dac682b9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3f7e192f01c7853e3651cd0d392cf3095ad8c76c2635831bcdb7a0dee721890",
+                        "s" : "0x095b22070592a5d0e6f1eceff0329522c2266082124961d30062cf20dac682b9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x116662802338f2d960c650e02e432e0f6e8a69e737488be976beec656313ddb7",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d9g2v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g2v0Filler.json",
+            "sourceHash" : "0a856b7036d112e2c1b5568a98137497cbc9c9dd35b8bf462ad207449a5e8dd6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xbb94856237dc77bbbe4051bd2da74674089b14400492ff10d22ab5e27d0fc41f",
+                    "mixHash" : "0x37242c91e8b4a4531996f13e425c90e12fdda984b72820a1a949533bdf8125a6",
+                    "nonce" : "0x8c946eb3b1f931fe",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6fe294293379b0877fd61540a7174f5344a6ceaab5315f07c09622edc946996e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea06fe294293379b0877fd61540a7174f5344a6ceaab5315f07c09622edc946996ea07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a037242c91e8b4a4531996f13e425c90e12fdda984b72820a1a949533bdf8125a6888c946eb3b1f931fef8c5f8c380018301adb094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ba0f3f7e192f01c7853e3651cd0d392cf3095ad8c76c2635831bcdb7a0dee721890a0095b22070592a5d0e6f1eceff0329522c2266082124961d30062cf20dac682b9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3f7e192f01c7853e3651cd0d392cf3095ad8c76c2635831bcdb7a0dee721890",
+                        "s" : "0x095b22070592a5d0e6f1eceff0329522c2266082124961d30062cf20dac682b9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbb94856237dc77bbbe4051bd2da74674089b14400492ff10d22ab5e27d0fc41f",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g3v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g3v0.json
index 7a73a41bf..3007e1a94 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g3v0.json
@@ -1,2 +1,326 @@
 {
+    "modexp_d9g3v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g3v0Filler.json",
+            "sourceHash" : "9884d6296c3abe1d9fe7a1c56c6b6a35111b822c795836d503728fe6679ce8c6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x82e966a70eb7dae609df90e18fa5f166aaf112b33232022ac141adffea3628ae",
+                    "mixHash" : "0xa788f18a5b12d8ddce3cf60be8f7f336de788b3e83bcbdf44a17d315f0053955",
+                    "nonce" : "0x8a78a4df3227e9aa",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x4a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x295476254768bd527ddccb0696ac0969dd74415eb509c680e9528cd548ac7e1f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a1b85c572e3f22580c49dc5103f9ad8fac11e25b174ca4da5027bd62df6e788a0295476254768bd527ddccb0696ac0969dd74415eb509c680e9528cd548ac7e1fa0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0a788f18a5b12d8ddce3cf60be8f7f336de788b3e83bcbdf44a17d315f0053955888a78a4df3227e9aaf8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca070b1f906c5d8a69b7574648068b0c7e538f5c2dd4845be3cc97f06b69d00a930a069b6d97c185706c1dbea482563d95c0db5f55ab20ecafa93e5a4fd5dfee3b0cac0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70b1f906c5d8a69b7574648068b0c7e538f5c2dd4845be3cc97f06b69d00a930",
+                        "s" : "0x69b6d97c185706c1dbea482563d95c0db5f55ab20ecafa93e5a4fd5dfee3b0ca",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x82e966a70eb7dae609df90e18fa5f166aaf112b33232022ac141adffea3628ae",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cb98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d9g3v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g3v0Filler.json",
+            "sourceHash" : "9884d6296c3abe1d9fe7a1c56c6b6a35111b822c795836d503728fe6679ce8c6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xf3e4138a664c8d409df4a3de978fb12f22496107e4443c9fad9b8d3a01c89daa",
+                    "mixHash" : "0x0a1c9ddde2d29ee045732edd62884b677a06c8a00b17b55b98910ffbeb0b5061",
+                    "nonce" : "0x65ddab6160b9aa0e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x295476254768bd527ddccb0696ac0969dd74415eb509c680e9528cd548ac7e1f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea0295476254768bd527ddccb0696ac0969dd74415eb509c680e9528cd548ac7e1fa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a00a1c9ddde2d29ee045732edd62884b677a06c8a00b17b55b98910ffbeb0b50618865ddab6160b9aa0ef8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca070b1f906c5d8a69b7574648068b0c7e538f5c2dd4845be3cc97f06b69d00a930a069b6d97c185706c1dbea482563d95c0db5f55ab20ecafa93e5a4fd5dfee3b0cac0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70b1f906c5d8a69b7574648068b0c7e538f5c2dd4845be3cc97f06b69d00a930",
+                        "s" : "0x69b6d97c185706c1dbea482563d95c0db5f55ab20ecafa93e5a4fd5dfee3b0ca",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf3e4138a664c8d409df4a3de978fb12f22496107e4443c9fad9b8d3a01c89daa",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d9g3v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g3v0Filler.json",
+            "sourceHash" : "9884d6296c3abe1d9fe7a1c56c6b6a35111b822c795836d503728fe6679ce8c6"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x593660781c2e1092cee118a3a9551b04b7b5bf525a6623af582e345397129cff",
+                    "mixHash" : "0x940f93a092fac70e65443c46d9bc705079558a31d60368a38f735f61cbd52701",
+                    "nonce" : "0x9ba10ffc753d6331",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x295476254768bd527ddccb0696ac0969dd74415eb509c680e9528cd548ac7e1f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea0295476254768bd527ddccb0696ac0969dd74415eb509c680e9528cd548ac7e1fa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0940f93a092fac70e65443c46d9bc705079558a31d60368a38f735f61cbd52701889ba10ffc753d6331f8c5f8c3800183030d4094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca070b1f906c5d8a69b7574648068b0c7e538f5c2dd4845be3cc97f06b69d00a930a069b6d97c185706c1dbea482563d95c0db5f55ab20ecafa93e5a4fd5dfee3b0cac0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70b1f906c5d8a69b7574648068b0c7e538f5c2dd4845be3cc97f06b69d00a930",
+                        "s" : "0x69b6d97c185706c1dbea482563d95c0db5f55ab20ecafa93e5a4fd5dfee3b0ca",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x593660781c2e1092cee118a3a9551b04b7b5bf525a6623af582e345397129cff",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/sec80_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/sec80_d0g0v0.json
index 6fd59269c..4cddc833b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/sec80_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/sec80_d0g0v0.json
@@ -2,8 +2,8 @@
     "sec80_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/sec80_d0g0v0Filler.json",
             "sourceHash" : "c14049667afdcacc1f8d0f46c166fc9aceb23e14ab85b5c483580f068af97b96"
         },
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xaf2d",
-                    "hash" : "0xbfa9de0b07a29cdb09ccb62a01679d2be89c2ecd6efec2e01061e55fb60e6c32",
-                    "mixHash" : "0xad840a8e0159575ce381d1ce7e1f09601c544581bbf2a54b1a9dc48970669bf8",
-                    "nonce" : "0x8b5513d611816f58",
+                    "hash" : "0x82add00154e49b69bbcb3de3f2193fc75cf96a7e6fc2d882c323bba2e916e7c2",
+                    "mixHash" : "0xe0b0a64bc7589e85a94139c80938abdae481945969d187942bf57f783c960bdb",
+                    "nonce" : "0x113bd4f971fb4bb3",
                     "number" : "0x01",
                     "parentHash" : "0x685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abf",
                     "receiptTrie" : "0xcb01b5c5f4202602d4329ead8fb66227f8dfefd2d75b05ee01e76b6118d43517",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce10dbcb9d2d598820a222faf6afe2b9dac77295062ab924717c8be82ce60f57a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0cb01b5c5f4202602d4329ead8fb66227f8dfefd2d75b05ee01e76b6118d43517b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082af2d8203e880a0ad840a8e0159575ce381d1ce7e1f09601c544581bbf2a54b1a9dc48970669bf8888b5513d611816f58f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90262f901f7a0685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce10dbcb9d2d598820a222faf6afe2b9dac77295062ab924717c8be82ce60f57a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0cb01b5c5f4202602d4329ead8fb66227f8dfefd2d75b05ee01e76b6118d43517b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082af2d8203e880a0e0b0a64bc7589e85a94139c80938abdae481945969d187942bf57f783c960bdb88113bd4f971fb4bb3f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "0x",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a4db33e2f4a0ef769302c3d94763756cd510430bdb2419ca098625180e2846a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbfa9de0b07a29cdb09ccb62a01679d2be89c2ecd6efec2e01061e55fb60e6c32",
+        "lastblockhash" : "0x82add00154e49b69bbcb3de3f2193fc75cf96a7e6fc2d882c323bba2e916e7c2",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {